From f15ba24a2eeb7208af9580c5d63b451c6712edab Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Thu, 10 Nov 2011 14:09:00 +0100 Subject: [PATCH] make hotfix commits trigger uploads to staging, not production-p-u --- kernel_inpbuilder.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kernel_inpbuilder.py b/kernel_inpbuilder.py index d16e57a..692f060 100644 --- a/kernel_inpbuilder.py +++ b/kernel_inpbuilder.py @@ -262,9 +262,9 @@ def determine_kernel_flavour(): flavour = GIT_REPO_NAME[6:-4] # slightly different version numbers per branch - if GIT_BRANCH_NAME == 'master' or GIT_BRANCH_NAME.startswith('hotfix'): + if GIT_BRANCH_NAME == 'master': debian_version = '$(version)-%s+%s' % (pb_version, REVISION) - elif GIT_BRANCH_NAME.startswith('release'): + elif GIT_BRANCH_NAME.startswith('release') or GIT_BRANCH_NAME.startswith('hotfix'): debian_version = '$(version)-%s~rc%s' % (pb_version, REVISION) else: debian_version = '$(version)-%s~develop%s' % (pb_version, REVISION) @@ -448,9 +448,9 @@ if __name__ == '__main__': logger.info('FTP Login on %s successful' %(ftp.host)) - if GIT_BRANCH_NAME == 'master' or GIT_BRANCH_NAME.startswith('hotfix/'): + if GIT_BRANCH_NAME == 'master': ftp.cwd('production-proposed-updates') - elif GIT_BRANCH_NAME.startswith('release/'): + elif GIT_BRANCH_NAME.startswith('release/') or GIT_BRANCH_NAME.startswith('hotfix/'): ftp.cwd('staging'); else: ftp.cwd('pre-staging'); -- 2.39.5