From: Mathias Klette <mathias.klette@profitbricks.com>
Date: Wed, 16 May 2012 13:51:45 +0000 (+0200)
Subject: lala
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=fd87829ad4c51ee034b21446608a684d72c627de;p=profitbricks%2Fjenkins-build-scripts.git

lala
---

diff --git a/debian_build.py b/debian_build.py
index b773376..0350554 100755
--- a/debian_build.py
+++ b/debian_build.py
@@ -437,21 +437,24 @@ if __name__ == '__main__':
                 cwd='/',
                 close_fds=True,
                 stdout=sys.stdout,
-                stderr=sys.stderr,
+                stderr=subprocess.STDOUT,
                 env={'':''}
         )
     
         logger.debug('Calling "%s" ..' %(' '.join(cmd)))
         ret = cmdobj.wait()
+        for line in ret.stdout.readlines():
+            logger.debug('%s' %(line))
+
         if ret:
             _str = (
-                    'Cmd "%s" returned non-zero (exitcode: %s).'
-                    %(' '.join(cmd), ret)
+                'Cmd "%s" returned non-zero (exitcode: %s).'
+                %(' '.join(cmd), ret)
             )
             logger.debug(_str)
             raise Exception(_str)
 
-        files = fnmatch.filter(os.listdir('../build-area/'),'*.orig.tar.gz')
+        files = [os.path.join('../build-area/',file) for file in fnmatch.filter(os.listdir('../build-area/'),'*.orig.tar.gz')]
         logger.debug('Previous upstream tarball(s) found: %s' %( files ))