From: Ralf Jung Date: Sat, 15 Dec 2012 17:15:13 +0000 (+0100) Subject: Add support for epoch in auto-debuild version numbers as well as binary shims X-Git-Url: https://git.ralfj.de/mass-build.git/commitdiff_plain/4f9926975fe894b227ab4dfadf080a0e6f3bd125 Add support for epoch in auto-debuild version numbers as well as binary shims --- diff --git a/build_system.py b/build_system.py index 83df7e2..290eb6d 100644 --- a/build_system.py +++ b/build_system.py @@ -85,8 +85,11 @@ try: self.vcs = vcs def build(self, reconfigure, waitAfterConfig): # reconfigure is ignored (we always do a reconfiguration) - # create auto-debuild configuration + # get version name versionName = self.config['versionName'] if 'versionName' in self.config else self.vcs.version() + if versionName is None: + raise Exception("VCS did not provide us with a proper version number, please fix this") + # create auto-debuild configuration autoDebuildConfig = { 'sourceName': self.config['name'], 'buildSystem': self.config['buildSystem'], @@ -98,11 +101,9 @@ try: 'version': versionName, 'waitAfterConfig': waitAfterConfig, } - 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', 'withPython2', 'binarySkipFiles', 'binaryInstallFiles', - 'buildDepends', 'binaryDepends', 'binaryRecommends', 'binaryProvides', 'binaryConflicts', 'binaryBreaks', + for option in ('epoch', 'dbgPackage', 'section', 'withPython2', 'binarySkipFiles', 'binaryInstallFiles', + 'buildDepends', 'binaryDepends', 'binaryShims', 'binaryRecommends', 'binaryProvides', 'binaryConflicts', 'binaryBreaks', 'binaryReplaces', 'binaryBreaksReplaces', 'alternatives', 'cmakeParameters', 'automakeParameters'): if option in self.config: