From 696d431e781dd19ed62b4390d4030c27bf8a99b2 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Wed, 1 Feb 2012 15:32:54 +0100 Subject: [PATCH] add preliminary support for building experimental branches --- kernel_inpbuilder.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/kernel_inpbuilder.py b/kernel_inpbuilder.py index 66905fe..40de66b 100644 --- a/kernel_inpbuilder.py +++ b/kernel_inpbuilder.py @@ -264,8 +264,10 @@ def determine_kernel_flavour(): # slightly different version numbers per branch if GIT_BRANCH_NAME == 'master': debian_version = '$(version)-%s+%s' % (pb_version, REVISION) - elif GIT_BRANCH_NAME.startswith('release') or GIT_BRANCH_NAME.startswith('hotfix'): + elif GIT_BRANCH_NAME.startswith('release/') or GIT_BRANCH_NAME.startswith('hotfix'): debian_version = '$(version)-%s~rc%s' % (pb_version, REVISION) + elif GIT_BRANCH_NAME == 'experimental': + debian_version = '$(version)-%s~experimental%s' % (pb_version, REVISION) else: debian_version = '$(version)-%s~develop%s' % (pb_version, REVISION) @@ -448,10 +450,10 @@ if __name__ == '__main__': logger.info('FTP Login on %s successful' %(ftp.host)) - if GIT_BRANCH_NAME == 'master': + if GIT_BRANCH_NAME == 'master' or GIT_BRANCH_NAME.startswith('hotfix/'): ftp.cwd('production-proposed-updates') - elif GIT_BRANCH_NAME.startswith('release/') or GIT_BRANCH_NAME.startswith('hotfix/'): - ftp.cwd('staging'); + elif GIT_BRANCH_NAME == 'experimental': + ftp.cwd('experimental'); else: ftp.cwd('pre-staging'); logger.info('FTP working directory: %s' %(ftp.pwd())) -- 2.39.5