]> Frank Brehm's Git Trees - profitbricks/jenkins-build-scripts.git/commitdiff
DEVINF-383: add correct version number (with epoch) to cidb
authorroot sagunt <root@sagunt.profitbricks.localdomain>
Mon, 1 Jul 2013 08:08:46 +0000 (08:08 +0000)
committerroot sagunt <root@sagunt.profitbricks.localdomain>
Mon, 1 Jul 2013 08:08:46 +0000 (08:08 +0000)
debian_build.py

index 0daa6c9f565e794c8797a0df9a54992ed7e51a85..5c8ccdec7b201bc6ce3fb26ce0826d52e39e213f 100755 (executable)
@@ -601,9 +601,10 @@ if __name__ == '__main__':
     try:
         create_dput_cfg()
         # strip epoch
-        if ":" in version:
-            version = version.split(":", 1)[1]
-        changes_file =  os.path.join(ENV['WORKSPACE'], '../build-area/result/', '%s_%s_amd64.changes' % (pkg_name, version))
+        dpkg_build_version = version
+        if ":" in dpkg_build_version:
+            dpkg_build_version = dpkg_build_version.split(":", 1)[1]
+        changes_file = os.path.join(ENV['WORKSPACE'], '../build-area/result/', '%s_%s_amd64.changes' % (pkg_name, dpkg_build_version))
         # display changes file
         fh = open(changes_file, 'r')
         logger.info('%s' % (fh.read()))