forward conflicting packages option

[mass-build.git] / build_system.py

diff --git a/build_system.py b/build_system.py
index 41061d34e195b4e4ef5019fa69e2045c1c991f7e..14877d41562339beda7b861dc20288aede1a4a6e 100644 (file)
--- a/build_system.py
+++ b/build_system.py
@@ -66,8 +66,8 @@ 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',
-                                       'buildDepends', 'binaryDepends', 'binaryRecommends', 'binaryProvides',
+                       for option in ('dbgPackage', 'section', 'withPython2', 'binarySkipFiles', 'binaryInstallFiles',
+                                       'buildDepends', 'binaryDepends', 'binaryRecommends', 'binaryProvides', 'binaryConflicts',
                                        'cmakeParameters', 'automakeParameters'):
                                if option in self.module:
                                        autoDebuildConfig[option] = self.module[option]