From: root sagunt <root@sagunt.profitbricks.localdomain>
Date: Mon, 1 Jul 2013 08:09:16 +0000 (+0000)
Subject: DEVINF-383: add correct version number (with epoch) to cidb
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=4d9d97856144b37e9905d86b1cbc63b1b6fe451d;p=profitbricks%2Fjenkins-build-scripts.git

DEVINF-383: add correct version number (with epoch) to cidb
---

diff --git a/debian_build.py b/debian_build.py
index 487827d..9e36c6e 100755
--- a/debian_build.py
+++ b/debian_build.py
@@ -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()
-