]> Frank Brehm's Git Trees - profitbricks/jenkins-build-scripts.git/commitdiff
remove newline
authorHolger Levsen <holger@layer-acht.org>
Thu, 1 Sep 2011 08:51:16 +0000 (10:51 +0200)
committerHolger Levsen <holger@layer-acht.org>
Thu, 1 Sep 2011 08:51:16 +0000 (10:51 +0200)
build.py

index 094ec544494b1f7fb65f791525fdb73164be7668..99a94cb5f4c78f4b431144c028938ea596be687a 100755 (executable)
--- a/build.py
+++ b/build.py
@@ -358,11 +358,6 @@ if __name__ == '__main__':
         )
        ret = parse_changelog.wait()
 
-        #stdout_msg = parse_changelog.stdout.read()
-
-        #logger.info(stdout_msg)
-
-       # i hate this: a version needs to include a . now...
        cmd = ['grep-dctrl', '-n', '-s', 'Version', '']
        grep_dctrl =  subprocess.Popen(
                 cmd,
@@ -375,8 +370,11 @@ if __name__ == '__main__':
         )
        ret = grep_dctrl.wait()
         version = grep_dctrl.stdout.read()
+       version = version.strip()
        logger.info('version is %s' % (version))
-       logger.info('std-error is %s' % (grep_dctrl.stderr.read()))
+
+        stdout_msg = parse_changelog.stdout.read()
+        logger.info(stdout_msg)
 
 
     if not GIT_COMMITTER_EMAIL: