]> Frank Brehm's Git Trees - profitbricks/jenkins-build-scripts.git/commitdiff
lala
authorMathias Klette <mathias.klette@profitbricks.com>
Wed, 16 May 2012 13:51:45 +0000 (15:51 +0200)
committerMathias Klette <mathias.klette@profitbricks.com>
Wed, 16 May 2012 13:51:45 +0000 (15:51 +0200)
debian_build.py

index b7733764aed6eee529c4a71314b68fc4cd20548d..0350554ffe1b9c1d42aa2c65275d83d9692da0f1 100755 (executable)
@@ -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 ))