summaryrefslogtreecommitdiff
path: root/morphlib/builder2.py
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2012-07-06 14:18:07 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2012-07-06 14:18:07 +0000
commit6cf82f80411ac0b6f1961e1739a31e31aa9b0382 (patch)
treed2c7d70c0921bed2901449d5c12df98c96f03dbf /morphlib/builder2.py
parent76f534936699eda59af840b2c297f689f0392954 (diff)
downloadmorph-6cf82f80411ac0b6f1961e1739a31e31aa9b0382.tar.gz
ChunkBuilder: runcmd, redirect err to out
Data buffers can get confused if two file handles are writing to the same file, python's subprocess module has subprocess.STDOUT for this.
Diffstat (limited to 'morphlib/builder2.py')
-rw-r--r--morphlib/builder2.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/morphlib/builder2.py b/morphlib/builder2.py
index b9679d99..41583149 100644
--- a/morphlib/builder2.py
+++ b/morphlib/builder2.py
@@ -22,6 +22,7 @@ import time
from collections import defaultdict
import tarfile
import traceback
+import subprocess
import cliapp
@@ -376,7 +377,7 @@ class ChunkBuilder(BuilderBase):
self.runcmd(['sh', '-c', cmd],
cwd=relative_builddir,
stdout=logfile,
- stderr=logfile)
+ stderr=subprocess.STDOUT)
logfile.flush()
except cliapp.AppException, e:
logfile.flush()