From 340c316308d6e1ef59e45b8e59ec3cddb3537b9c Mon Sep 17 00:00:00 2001 From: Ryan Blue Date: Fri, 18 Dec 2015 09:12:15 -0800 Subject: [PATCH] PARQUET-410: Fix hanging subprocess call in merge script. This removes the option that redirects stderr to stdout because it causes git push to hang. --- dev/merge_parquet_pr.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/merge_parquet_pr.py b/dev/merge_parquet_pr.py index 621fcde807..b1896e2e17 100755 --- a/dev/merge_parquet_pr.py +++ b/dev/merge_parquet_pr.py @@ -81,9 +81,9 @@ def fail(msg): def run_cmd(cmd): try: if isinstance(cmd, list): - return subprocess.check_output(cmd, stderr=subprocess.STDOUT) + return subprocess.check_output(cmd) else: - return subprocess.check_output(cmd.split(" "), stderr = subprocess.STDOUT) + return subprocess.check_output(cmd.split(" ")) except subprocess.CalledProcessError as e: # this avoids hiding the stdout / stderr of failed processes print 'Command failed: %s' % cmd