aboutsummaryrefslogtreecommitdiff
path: root/ec2
diff options
context:
space:
mode:
authorPatrick Wendell <pwendell@gmail.com>2014-06-17 15:09:24 -0700
committerXiangrui Meng <meng@databricks.com>2014-06-17 15:09:24 -0700
commitb2ebf429e24566c29850c570f8d76943151ad78c (patch)
tree0bfb766cb793d538e934edb5e0556743645699b2 /ec2
parenta14807e84cbda64e5a73babb7a28c69ee1ef3cbb (diff)
downloadspark-b2ebf429e24566c29850c570f8d76943151ad78c.tar.gz
spark-b2ebf429e24566c29850c570f8d76943151ad78c.tar.bz2
spark-b2ebf429e24566c29850c570f8d76943151ad78c.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
Diffstat (limited to 'ec2')
-rwxr-xr-xec2/spark_ec2.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py
index 803caa0c48..a40311d9fc 100755
--- a/ec2/spark_ec2.py
+++ b/ec2/spark_ec2.py
@@ -693,7 +693,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: