From: Holger Levsen <holger@layer-acht.org>
Date: Wed, 15 Feb 2012 13:42:19 +0000 (+0100)
Subject: release builds should go to pre-staging
X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=33319913b41ec05880b8bcb4e31e11610572161b;p=profitbricks%2Fjenkins-build-scripts.git

release builds should go to pre-staging
---

diff --git a/debian_build.py b/debian_build.py
index 66f49de..54ee3d0 100755
--- a/debian_build.py
+++ b/debian_build.py
@@ -420,9 +420,9 @@ if __name__ == '__main__':
 
     if options.distribution in ('experimental'):
       pb_suite=changelog_distro
-    elif options.distribution in ('unstable' , 'pre-staging'):
+    elif GIT_BRANCH_NAME.startswith('release/') or options.distribution in ('unstable' , 'pre-staging'):
       pb_suite='pre-staging'
-    elif GIT_BRANCH_NAME.startswith('release/') or GIT_BRANCH_NAME.startswith('hotfix/') or options.distribution in ('stable', 'stable-proposed-updates', 'production', 'production-proposed-updates'):
+    elif GIT_BRANCH_NAME.startswith('hotfix/') or options.distribution in ('stable', 'stable-proposed-updates', 'production', 'production-proposed-updates'):
       pb_suite='production-proposed-updates'
 	
     gbp = git_buildpackage.GitBuildPackage(