Repository: parquet-mr Updated Branches: refs/heads/master 63d5ae78a -> 06a468995
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. Author: Ryan Blue <[email protected]> Closes #302 from rdblue/PARQUET-410-fix-subprocess-hang and squashes the following commits: 340c316 [Ryan Blue] PARQUET-410: Fix hanging subprocess call in merge script. Project: http://git-wip-us.apache.org/repos/asf/parquet-mr/repo Commit: http://git-wip-us.apache.org/repos/asf/parquet-mr/commit/06a46899 Tree: http://git-wip-us.apache.org/repos/asf/parquet-mr/tree/06a46899 Diff: http://git-wip-us.apache.org/repos/asf/parquet-mr/diff/06a46899 Branch: refs/heads/master Commit: 06a4689959e361729c405e78b8a5964228cb521f Parents: 63d5ae7 Author: Ryan Blue <[email protected]> Authored: Wed Feb 3 11:49:08 2016 -0800 Committer: Ryan Blue <[email protected]> Committed: Wed Feb 3 11:49:08 2016 -0800 ---------------------------------------------------------------------- dev/merge_parquet_pr.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/parquet-mr/blob/06a46899/dev/merge_parquet_pr.py ---------------------------------------------------------------------- diff --git a/dev/merge_parquet_pr.py b/dev/merge_parquet_pr.py index 621fcde..b1896e2 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
