From: Holger Levsen Date: Thu, 3 Nov 2011 13:50:29 +0000 (+0100) Subject: small fixes X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=ae9b83e93be9ee41f2f4a3dccc2ba192743f9cfc;p=profitbricks%2Fjenkins-build-scripts.git small fixes --- diff --git a/kernel_inpbuilder.py b/kernel_inpbuilder.py index c81b767..82c0810 100644 --- a/kernel_inpbuilder.py +++ b/kernel_inpbuilder.py @@ -15,6 +15,7 @@ from glob import glob from logging import Formatter from ftplib import FTP from multiprocessing import cpu_count +from lib import git_helper __version__ = '0.0.2' diff --git a/lib/git_helper.py b/lib/git_helper.py index 6ffa06b..d4c313a 100644 --- a/lib/git_helper.py +++ b/lib/git_helper.py @@ -333,8 +333,9 @@ def git_get_commit_id(): %(' '.join(cmd), ret, error_str) ) return False - logger.debug('current commit id is %s' % stdout_str[0]) - return stdout_str[0] + stdout_str = cmdobj.stdout.read() + logger.debug('current commit id is %s' % stdout_str) + return stdout_str def git_get_commit_date(): """ @@ -369,7 +370,8 @@ def git_get_commit_date(): %(' '.join(cmd), ret, error_str) ) return False - logger.debug('current commit date is %s' % stdout_str[0]) - return stdout_str[0] + stdout_str = cmdobj.stdout.read() + logger.debug('current commit date is %s' % stdout_str) + return stdout_str # vim: autoindent smartindent tabstop=4 expandtab shiftwidth=4 softtabstop=4 nu enc=utf-8 cinwords=if,elif,else,for,while,try,except,finally,def,class