forward conflicting packages option

[mass-build.git] / build_system.py

diff --git a/build_system.py b/build_system.py
index cb90c6352b7fdb121f8738bea1cf0e569595f518..14877d41562339beda7b861dc20288aede1a4a6e 100644 (file)
--- a/build_system.py
+++ b/build_system.py
@@ -67,7 +67,7 @@ try:
                                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', 'withPython2', 'binarySkipFiles', 'binaryInstallFiles',
                                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', 'withPython2', 'binarySkipFiles', 'binaryInstallFiles',

-                                       'buildDepends', 'binaryDepends', 'binaryRecommends', 'binaryProvides',
+                                       'buildDepends', 'binaryDepends', 'binaryRecommends', 'binaryProvides', 'binaryConflicts',

                                        'cmakeParameters', 'automakeParameters'):
                                if option in self.module:
                                        autoDebuildConfig[option] = self.module[option]
                                        'cmakeParameters', 'automakeParameters'):
                                if option in self.module:
                                        autoDebuildConfig[option] = self.module[option]