From: Ralf Jung <post@ralfj.de>
Date: Sun, 12 Aug 2012 13:09:54 +0000 (+0200)
Subject: forward conflicting packages option
X-Git-Url: https://git.ralfj.de/mass-build.git/commitdiff_plain/46555a8f18b5d45e61b4a33665f930cc7ae268b0?ds=sidebyside;hp=e84e84ae4c6484a46758e712d1c1db40242b02df

forward conflicting packages option
---

diff --git a/build_system.py b/build_system.py
index cb90c63..14877d4 100644
--- 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',
-					'buildDepends', 'binaryDepends', 'binaryRecommends', 'binaryProvides',
+					'buildDepends', 'binaryDepends', 'binaryRecommends', 'binaryProvides', 'binaryConflicts',
 					'cmakeParameters', 'automakeParameters'):
 				if option in self.module:
 					autoDebuildConfig[option] = self.module[option]