From: Ralf Jung Date: Sun, 12 Aug 2012 11:47:36 +0000 (+0200) Subject: forward python 2 configuration X-Git-Url: https://git.ralfj.de/mass-build.git/commitdiff_plain/e84e84ae4c6484a46758e712d1c1db40242b02df?hp=187e1b6111879b67f575940be29d2adeb715102c forward python 2 configuration --- diff --git a/build_system.py b/build_system.py index 41061d3..cb90c63 100644 --- a/build_system.py +++ b/build_system.py @@ -66,7 +66,7 @@ try: if autoDebuildConfig['version'] is None: raise Exception("VCS did not provide us with a proper version number, please fix this") # copy some more optional configuration - for option in ('dbgPackage', 'section', 'binarySkipFiles', 'binaryInstallFiles', + for option in ('dbgPackage', 'section', 'withPython2', 'binarySkipFiles', 'binaryInstallFiles', 'buildDepends', 'binaryDepends', 'binaryRecommends', 'binaryProvides', 'cmakeParameters', 'automakeParameters'): if option in self.module: diff --git a/mass_build.py b/mass_build.py index cdf5114..11e5199 100755 --- a/mass_build.py +++ b/mass_build.py @@ -106,7 +106,7 @@ for project in workProjects: print "Building module",project.sourceFolder() project.buildSystem.build(reconfigure=args.reconfigure) print - except (subprocess.CalledProcessError, KeyboardInterrupt) as e: + except (subprocess.CalledProcessError, KeyboardInterrupt) as e: # for some exceptions, a stackrace is usually pointless print >> sys.stderr print >> sys.stderr if isinstance(e, KeyboardInterrupt): # str(e) would be the empty string