From fd5724eca7edae6a67b7c096653ba5e996874ea8 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Mon, 18 Sep 2017 10:45:03 +0100 Subject: [PATCH] make-release.py: Send stderr to stdout --- zcutil/make-release.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/zcutil/make-release.py b/zcutil/make-release.py index 930970a3a..3e9741aab 100755 --- a/zcutil/make-release.py +++ b/zcutil/make-release.py @@ -335,8 +335,9 @@ def sh_out(*args): def sh_log(*args): PIPE = subprocess.PIPE + STDOUT = subprocess.STDOUT try: - p = subprocess.Popen(args, stdout=PIPE, stderr=PIPE, stdin=None) + p = subprocess.Popen(args, stdout=PIPE, stderr=STDOUT, stdin=None) except OSError: logging.error('Error launching %r...', args) raise @@ -357,8 +358,9 @@ def sh_progress(markers, *args): return PIPE = subprocess.PIPE + STDOUT = subprocess.STDOUT try: - p = subprocess.Popen(args, stdout=PIPE, stderr=PIPE, stdin=None) + p = subprocess.Popen(args, stdout=PIPE, stderr=STDOUT, stdin=None) except OSError: logging.error('Error launching %r...', args) raise