From 94ca7c271fe6d36d2eff7f0ad24dadc7fad1caea Mon Sep 17 00:00:00 2001 From: Joshua Hesketh Date: Mon, 7 Oct 2013 10:29:46 +1100 Subject: [PATCH] capture stderr into stdout --- turbo_hipster/lib/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/turbo_hipster/lib/utils.py b/turbo_hipster/lib/utils.py index 5a0237d..b591369 100644 --- a/turbo_hipster/lib/utils.py +++ b/turbo_hipster/lib/utils.py @@ -123,7 +123,7 @@ def execute_to_log(cmd, logfile, timeout=-1, cmd += ' 2>&1' start_time = time.time() p = subprocess.Popen( - cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + cmd, shell=True, stderr=subprocess.STDOUT) descriptors[p.stdout.fileno()] = dict( name='[output]',