capture stderr into stdout

This commit is contained in:
Joshua Hesketh 2013-10-07 10:29:46 +11:00
parent 0b3fe58866
commit 94ca7c271f

View File

@ -123,7 +123,7 @@ def execute_to_log(cmd, logfile, timeout=-1,
cmd += ' 2>&1' cmd += ' 2>&1'
start_time = time.time() start_time = time.time()
p = subprocess.Popen( p = subprocess.Popen(
cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) cmd, shell=True, stderr=subprocess.STDOUT)
descriptors[p.stdout.fileno()] = dict( descriptors[p.stdout.fileno()] = dict(
name='[output]', name='[output]',