From: Mathias Klette <mathias.klette@profitbricks.com>
Date: Mon, 13 May 2013 14:03:00 +0000 (+0200)
Subject: debian_build: seperate branch and dist with dash in experimental packages
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=325908b924e2e5058ea1a520fc1e54d3c2d3b5be;p=profitbricks%2Fjenkins-build-scripts.git

debian_build: seperate branch and dist with dash in experimental packages
---

diff --git a/debian_build.py b/debian_build.py
index 64b4e53..08b40bb 100755
--- a/debian_build.py
+++ b/debian_build.py
@@ -227,7 +227,10 @@ if __name__ == '__main__':
             # reprepro uses dynamic distributions based on the distribution
             # value given in the package. to not interferre with experimental
             # squeeze package, we need to include the distribution here.
-            new_dist = 'dev-' + ENV['GIT_BRANCH'].replace("/","-") + ENV['DISTRIBUTION']
+            new_dist = 'dev-{branch}-{dist}'.format(
+                branch = ENV['GIT_BRANCH'].replace("/","-"),
+                dist = ENV['DISTRIBUTION'],
+                )
             dput_obj.contents.update({
                 'incoming': '/srv/dev-repository/incoming/wheezy',
                 })