From 019251a518d557bb93f7a82f41a29534ddf60ed6 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Tue, 14 Feb 2012 17:01:49 +0100 Subject: [PATCH] hotfix builds should not modify debian/changelog and should go to p-p-u. release builds should go to pre-staging --- debian_build.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/debian_build.py b/debian_build.py index 0a6c11f..dbe9ebe 100755 --- a/debian_build.py +++ b/debian_build.py @@ -349,12 +349,12 @@ if __name__ == '__main__': DPUT_OPTIONS = DPUT_OPTIONS_DEFAULT - if options.distribution in ('testing', 'staging', 'unstable', 'pre-staging','experimental') or GIT_BRANCH_NAME.startswith('release/') or GIT_BRANCH_NAME.startswith('hotfix/'): + if options.distribution in ('testing', 'staging', 'unstable', 'pre-staging','experimental') or GIT_BRANCH_NAME.startswith('release/'): daily_date = datetime.datetime.now().strftime('%Y%m%d%H%M%S') current_commit = git_helper.git_get_commit_id() - if GIT_BRANCH_NAME.startswith('release/') or GIT_BRANCH_NAME.startswith('hotfix/'): + if GIT_BRANCH_NAME.startswith('release/'): version = '%s~rc%s+%s+%s' %(version, daily_date, BUILD_NUMBER, current_commit[0:7]) elif GIT_BRANCH_NAME.startswith('feature/') or GIT_BRANCH_NAME.startswith('poc/') or GIT_BRANCH_NAME.startswith('bugfix/') or options.distribution == 'experimental': version = '%s~experimental%s+%s+%s' %(version, daily_date, BUILD_NUMBER, current_commit[0:7]) @@ -420,9 +420,9 @@ if __name__ == '__main__': if options.distribution in ('experimental'): pb_suite='experimental' - elif options.distribution in ('unstable' , 'pre-staging'): + elif options.distribution in ('unstable' , 'pre-staging') or GIT_BRANCH_NAME.startswith('release/'): 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( -- 2.39.5