diff --git a/scons/scons-local-3.0.1/SCons/Util.py b/scons/scons-local-3.0.1/SCons/Util.py index c9aa2b53d..9fa079251 100644 --- a/scons/scons-local-3.0.1/SCons/Util.py +++ b/scons/scons-local-3.0.1/SCons/Util.py @@ -1032,7 +1032,7 @@ class CLVar(UserList): def __coerce__(self, other): return (self, CLVar(other)) def __str__(self): - return ' '.join(self.data) + return ' '.join([' '.join(f) if type(f) is tuple else f for f in self.data]) # A dictionary that preserves the order in which items are added. # Submitted by David Benjamin to ActiveState's Python Cookbook web site: diff --git a/utils/mapnik-config/build.py b/utils/mapnik-config/build.py index 6cddbeb37..10305302c 100644 --- a/utils/mapnik-config/build.py +++ b/utils/mapnik-config/build.py @@ -63,7 +63,6 @@ def write_config(env, template_filename, config_filename): if val is None: return matchobj.group(0) else: - print(key,":",val) return 'CONFIG_%s=%s' % (key, escape(str(val))) config = re.sub(r'^CONFIG_(\w+)=.*', subst, template, flags=re.M) config_file.write(config)