From 43b01791ac7273ef1ad0557e926988a6c4924256 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Wed, 18 Jan 2012 16:03:08 +0100 Subject: [PATCH] make builds from release+hotfix branches be uploaded to production-proposed-updates --- debian_build.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/debian_build.py b/debian_build.py index 6d073db..14f3d0b 100755 --- a/debian_build.py +++ b/debian_build.py @@ -341,7 +341,7 @@ if __name__ == '__main__': if options.distribution in ('testing', 'staging', 'unstable', 'pre-staging','experimental'): daily_date = datetime.datetime.now().strftime('%Y%m%d%H%M%S') - if options.distribution in ('testing', 'staging'): + if GIT_BRANCH_NAME.startswith('release') or GIT_BRANCH_NAME.startswith('hotfix'): version = '%s~rc%s' %(version, daily_date) else: version = '%s~develop%s' %(version, daily_date) @@ -399,9 +399,7 @@ if __name__ == '__main__': pb_suite='experimental' elif options.distribution in ('unstable' , 'pre-staging'): pb_suite='pre-staging' - elif options.distribution in ('testing', 'staging'): - pb_suite='staging' - elif options.distribution in ('stable', 'stable-proposed-updates', 'production', 'production-proposed-updates'): + elif GIT_BRANCH_NAME.startswith('release') or 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( -- 2.39.5