]> 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:09:16 +0000 (08:09 +0000)
committerroot sagunt <root@sagunt.profitbricks.localdomain>
Mon, 1 Jul 2013 08:09:16 +0000 (08:09 +0000)
debian_build.py

index 487827dd701626a7bbfc3c87790eae5256bac301..9e36c6ea5b6309d6cd6fecb64be61c14a398644f 100755 (executable)
@@ -571,13 +571,19 @@ export {gbp_env} FORCE_SHELL=TRUE
         figlet('Upload skipped')
     else:
         try:
+            # strip epoch
+
+            dpkg_build_version = new_version
+            if ":" in dpkg_build_version:
+                dpkg_build_version = dpkg_build_version.split(":", 1)[1]
+
             # construct path for changes file
             changes_file = os.path.join(
                 ENV['WORKSPACE'],
                 '../build-area/result/',
                 '{name}_{version}_amd64.changes'.format(
                     name=curr_name,
-                    version=urllib.quote(new_version),
+                    version=dpkg_build_version,
                 )
             )
 
@@ -642,4 +648,3 @@ export {gbp_env} FORCE_SHELL=TRUE
     logger.info('---------------------------------------------------------------------------------------------------------')
     figlet('Success!!!')
     exit_ok()
-