Support specifying a SHA1 as version

[mass-build.git] / build_system.py

diff --git a/build_system.py b/build_system.py
index a46e6e8adc92e4c7001ae16e71f89039f41d1031..9a646538f321c1e739777dccd3a2c784c13e2b8a 100644 (file)
--- a/build_system.py
+++ b/build_system.py
@@ -51,7 +51,8 @@ try:
                                'email': config['debEMail'],
                        }
                        self.copyFromModule(module, 'buildDepends')
-                       if buildSystem == 'cmakeParameters':
+                       self.copyFromModule(module, 'binaryDepends')
+                       if buildSystem == 'cmake':
                                self.copyFromModule(module, 'cmakeParameters')
                        self.vcs = vcs
                        self.configured = False # make sure configure is called before build/install
@@ -62,9 +63,11 @@ try:
 
                def configure(self, force=False): # force is ignored
                        self.autoDebuildConfig['version'] = self.vcs.version() # by now, data has been fetched, so this is possible
+                       if self.autoDebuildConfig['version'] is None:
+                               raise Exception("VCS did not provide us with a proper version, please fix this")
                        self.vcs.ignore('/debian/') # make sure the debian folder is ignored
                        os.chdir(self.sourceFolder)
-                       print self.autoDebuildConfig
+                       #print self.autoDebuildConfig
                        self.files = auto_debuild.createDebianFiles(self.autoDebuildConfig)
                        self.configured = True