diff options
| author | Patrick Wendell <pwendell@gmail.com> | 2014-06-17 15:09:24 -0700 |
|---|---|---|
| committer | Xiangrui Meng <meng@databricks.com> | 2014-06-17 15:09:38 -0700 |
| commit | ac6c10e5d160228bb196e0d389f8583e73c42392 (patch) | |
| tree | e010f3c5d2462ac074c8f696f4074491b84d9f3e | |
| parent | e6c90583b4d68ddce3f9dd2c76c8bbad593ad077 (diff) | |
| download | spark-ac6c10e5d160228bb196e0d389f8583e73c42392.tar.gz spark-ac6c10e5d160228bb196e0d389f8583e73c42392.tar.bz2 spark-ac6c10e5d160228bb196e0d389f8583e73c42392.zip | |
HOTFIX: bug caused by #941
This patch should have qualified the use of PIPE. This needs to be back ported into 0.9 and 1.0.
Author: Patrick Wendell <pwendell@gmail.com>
Closes #1108 from pwendell/hotfix and squashes the following commits:
711c58d [Patrick Wendell] HOTFIX: bug caused by #941
(cherry picked from commit b2ebf429e24566c29850c570f8d76943151ad78c)
Signed-off-by: Xiangrui Meng <meng@databricks.com>
| -rwxr-xr-x | ec2/spark_ec2.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py index 89244642f9..2ebe97fdb2 100755 --- a/ec2/spark_ec2.py +++ b/ec2/spark_ec2.py @@ -646,7 +646,7 @@ def ssh(host, opts, command): def _check_output(*popenargs, **kwargs): if 'stdout' in kwargs: raise ValueError('stdout argument not allowed, it will be overridden.') - process = subprocess.Popen(stdout=PIPE, *popenargs, **kwargs) + process = subprocess.Popen(stdout=subprocess.PIPE, *popenargs, **kwargs) output, unused_err = process.communicate() retcode = process.poll() if retcode: |