]> git.decadent.org.uk Git - dak.git/commitdiff
Merge remote branch 'lamby/master' into merge
authorJoerg Jaspert <joerg@debian.org>
Wed, 7 Jul 2010 21:28:24 +0000 (23:28 +0200)
committerJoerg Jaspert <joerg@debian.org>
Wed, 7 Jul 2010 21:28:24 +0000 (23:28 +0200)
* lamby/master:
  Popen.communicate calls stdout.close() which looks like is causing errors w/threads..
  Finally kill m68k
  Support +b[0-9] versions in autobyhand for di

Signed-off-by: Joerg Jaspert <joerg@debian.org>
daklib/utils.py

index 5c7164705ee4147fe7f07c67d1adf0180e438cea..c9b54d078db3bc6b85e05e214823eb8b54f2aa74 100755 (executable)
@@ -70,7 +70,9 @@ def dak_getstatusoutput(cmd):
     pipe = subprocess.Popen(cmd, shell=True, universal_newlines=True,
         stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
 
-    output, _ = pipe.communicate()
+    output = pipe.stdout.read()
+
+    pipe.wait()
 
     if output[-1:] == '\n':
         output = output[:-1]