From: Holger Levsen <holger@layer-acht.org>
Date: Sat, 17 Sep 2011 18:13:08 +0000 (+0200)
Subject: try again.
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=1aa6b6ccc6b937ba7c026ef0d1a5c1a4d38810ab;p=profitbricks%2Fjenkins-build-scripts.git

try again.
---

diff --git a/debian_build.py b/debian_build.py
index 612b703..df31a18 100755
--- a/debian_build.py
+++ b/debian_build.py
@@ -329,7 +329,7 @@ if __name__ == '__main__':
                 stdout=subprocess.PIPE,
                 stderr=subprocess.PIPE,
                 cwd='./',
-		universal_newlines=True
+                universal_newlines=True
         )
 
         ret = git_log.wait()
@@ -354,7 +354,7 @@ if __name__ == '__main__':
 
         logger.debug('Trying to call: %s' %(' '.join(cmd)))
 
-        new_log = git_log.stdout
+        new_log = git_log.stdout.read()
 
         dch = subprocess.Popen(
                 cmd,
@@ -373,11 +373,11 @@ if __name__ == '__main__':
             )
         logger.info('debian/changelog written')
 
-        if new_log.read() == '': 
+        if new_log == '': 
             logger.info('git log since yesterday is empty, aborting build.')
             sys.exit(0)
         else:
-            logger.info('git log since yesterday: %s ' % new_log.read())
+            logger.info('git log since yesterday: %s ' % new_log)
 
 
         # we need to commit here else git-buildpackage will use the existing debian/changelog...