From cc384b588a529e4ae596dbb41b23ae29f97e1050 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Wed, 18 Jan 2012 16:24:46 +0100 Subject: [PATCH] add ~alpha to builds from experiemental and fix bug preventing ~rc to be added to release version numbers in changelog --- debian_build.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/debian_build.py b/debian_build.py index 14f3d0b..dc4b709 100755 --- a/debian_build.py +++ b/debian_build.py @@ -338,11 +338,13 @@ if __name__ == '__main__': ) exit_error() - if options.distribution in ('testing', 'staging', 'unstable', 'pre-staging','experimental'): + if options.distribution in ('testing', 'staging', 'unstable', 'pre-staging','experimental') or GIT_BRANCH_NAME.startswith('release') or GIT_BRANCH_NAME.startswith('hotfix'): daily_date = datetime.datetime.now().strftime('%Y%m%d%H%M%S') if GIT_BRANCH_NAME.startswith('release') or GIT_BRANCH_NAME.startswith('hotfix'): version = '%s~rc%s' %(version, daily_date) + elif options.distribution.startswith('feature') or options.distribution == 'experimental': + version = '%s~alpha%s' %(version, daily_date) else: version = '%s~develop%s' %(version, daily_date) -- 2.39.5