From b2ebf429e24566c29850c570f8d76943151ad78c Mon Sep 17 00:00:00 2001 From: Patrick Wendell Date: Tue, 17 Jun 2014 15:09:24 -0700 Subject: 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 Closes #1108 from pwendell/hotfix and squashes the following commits: 711c58d [Patrick Wendell] HOTFIX: bug caused by #941 --- ec2/spark_ec2.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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: -- cgit v1.2.3