From: Holger Levsen Date: Thu, 3 Nov 2011 14:22:50 +0000 (+0100) Subject: strip double quotes X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=df940b3831b3bbbe46576efb08910e46b8ad3e6e;p=profitbricks%2Fjenkins-build-scripts.git strip double quotes --- diff --git a/kernel_inpbuilder.py b/kernel_inpbuilder.py index b61d877..57b73bc 100644 --- a/kernel_inpbuilder.py +++ b/kernel_inpbuilder.py @@ -447,7 +447,7 @@ if __name__ == '__main__': # update changelog cmd = 'sed -i -e \'s#DUMMY_ENTRY#%s#\' -e \'s#DUMMY_DATE#%s#\' %s' % (git_helper.git_get_commit_id(),git_helper.git_get_commit_date(),os.path.join(OVERLAY_DIR,'changelog')) - logger.info(cmd) + logger.info('Running %s' % cmd) os.system(cmd) if not build_kernel(kernel_flavour, REVISION, OVERLAY_DIR, [ 'kernel_debug', 'kernel_image' ]): diff --git a/lib/git_helper.py b/lib/git_helper.py index 74f5242..f6020b5 100644 --- a/lib/git_helper.py +++ b/lib/git_helper.py @@ -333,7 +333,7 @@ def git_get_commit_id(): %(' '.join(cmd), ret, error_str) ) return False - stdout_str = cmdobj.stdout.read() + stdout_str = cmdobj.stdout.read()[1:-1] logger.info('current commit id is %s' % stdout_str) return stdout_str @@ -370,7 +370,7 @@ def git_get_commit_date(): %(' '.join(cmd), ret, error_str) ) return False - stdout_str = cmdobj.stdout.read() + stdout_str = cmdobj.stdout.read()[1:-1] logger.info('current commit date is %s' % stdout_str) return stdout_str