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

index a88084743383f1fa18dd9f9a9dbcbbb25e3d3150..fdc9ca92b6946d7f54c9ce25c8e61d52604ccc93 100755 (executable)
--- a/build.py
+++ b/build.py
@@ -358,18 +358,17 @@ if __name__ == '__main__':
         )
        ret = parse_changelog.wait()
 
-        stdout_msg = parse_changelog.stdout.read()
+        #stdout_msg = parse_changelog.stdout.read()
 
-        logger.info(stdout_msg)
+        #logger.info(stdout_msg)
 
        # i hate this: a version needs to include a . now...
-       #cmd = ['grep-dctrl', '-n', '-s', 'Version', '.']
-       cmd = [ "awk '/^Version: / {print $2}'"]
+       cmd = ['grep-dctrl', '-n', '-s', 'Version', '']
        grep_dctrl =  subprocess.Popen(
                 cmd,
                 shell=True,
                 close_fds=True,
-               stdin=parse_changelog.stdout,
+               stdin=parse_changelog.stdout.read(),
                 stdout=subprocess.PIPE,
                 stderr=subprocess.PIPE,
                 cwd=os.getcwd()