From ffdf1f7ddc5fff541f6b31ee55f451f16189b612 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Sun, 18 Sep 2011 13:35:56 +0200 Subject: [PATCH] use en_UK and add some debug output --- kernel_inpbuilder.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/kernel_inpbuilder.py b/kernel_inpbuilder.py index b83827d..c2fd632 100644 --- a/kernel_inpbuilder.py +++ b/kernel_inpbuilder.py @@ -247,15 +247,18 @@ def add_local_version_to_config(kernel_build_revision): kernel_config = read_file(KERNEL_CONFIG_PATH) # don't put the branch names into the packages names if GIT_BRANCH_NAME[7:] == 'master-': - flavor=GIT_BRANCH_NAME[:7] + flavour = GIT_BRANCH_NAME[:7] elif GIT_BRANCH_NAME[8:] == 'develop-': - flavor=GIT_BRANCH_NAME[:8] + flavour = GIT_BRANCH_NAME[:8] elif GIT_BRANCH_NAME[8:] == 'release-': - flavor=GIT_BRANCH_NAME[:8] + flavour = GIT_BRANCH_NAME[:8] elif GIT_BRANCH_NAME[7:] == 'hotfix-': - flavor=GIT_BRANCH_NAME[:7] + flavour = GIT_BRANCH_NAME[:7] + else: + logger.error('GIT_BRANCH_NAME is %s' % GIT_BRANCH_NAME) + flavour = 'none' - localversion = '-profitbricks-%s' %(flavor) + localversion = '-profitbricks-%s' % flavour for lino, line in kernel_config.iteritems(): try: key, value = CREG_KERNEL_CONFIG_DELIM.split(line) -- 2.39.5