]> Frank Brehm's Git Trees - profitbricks/jenkins-build-scripts.git/commitdiff
spaghetti code is starting to hurt
authorHolger Levsen <holger@layer-acht.org>
Wed, 15 Feb 2012 16:20:58 +0000 (17:20 +0100)
committerHolger Levsen <holger@layer-acht.org>
Wed, 15 Feb 2012 16:20:58 +0000 (17:20 +0100)
debian_build.py

index 67992893cd8bd87396c8d03cf3d09a6f97760697..905dbb38b61f7125f29c2b57a4d7494ba86b7ffc 100755 (executable)
@@ -418,7 +418,7 @@ if __name__ == '__main__':
     cmd = ['/usr/bin/git', 'commit', '-a', '-m', 'add new changelog entry']
     subprocess.check_call(cmd)
 
-    if options.distribution in ('experimental'):
+    if GIT_BRANCH_NAME == 'experimental' or GIT_BRANCH_NAME.startswith('feature/') or GIT_BRANCH_NAME.startswith('poc/') or GIT_BRANCH_NAME.startswith('bugfix/'):
       pb_suite=changelog_distro
     elif GIT_BRANCH_NAME.startswith('release/') or options.distribution in ('unstable' , 'pre-staging'):
       pb_suite='pre-staging'