forward python 2 configuration

diff --git a/build_system.py b/build_system.py
index 41061d34e195b4e4ef5019fa69e2045c1c991f7e..cb90c6352b7fdb121f8738bea1cf0e569595f518 100644 (file)
--- 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
                        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:
                                        'buildDepends', 'binaryDepends', 'binaryRecommends', 'binaryProvides',
                                        'cmakeParameters', 'automakeParameters'):
                                if option in self.module:

diff --git a/mass_build.py b/mass_build.py
index cdf511402caad26525c0acc6d46d581b55333b06..11e519966e783aafea3ae3c357f8153d4e9ff604 100755 (executable)
--- 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
                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
                print >> sys.stderr
                print >> sys.stderr
                if isinstance(e, KeyboardInterrupt): # str(e) would be the empty string