From 0f77a81bb04192f744a39f66e52a206b0ec647ee Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Wed, 15 Feb 2012 16:26:44 +0100 Subject: [PATCH] fix hotfix handling --- debian_build.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian_build.py b/debian_build.py index c7684d4..5a9d7fb 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]) -- 2.39.5