Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added compatibility for python 2.6 for ssh_read command #941

Closed
wants to merge 2 commits into from
Closed

added compatibility for python 2.6 for ssh_read command #941

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6ed85c
added compatibility for python 2.6 for ssh_read command
AtlasPilotPuppy Jun 2, 2014
4ca441d
Implmented check_optput withinthe module to work with python 2.6
AtlasPilotPuppy Jun 10, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion ec2/spark_ec2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -669,8 +669,22 @@ def ssh(host, opts, command):
tries = tries + 1


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)
output, unused_err = process.communicate()
retcode = process.poll()
if retcode:
cmd = kwargs.get("args")
if cmd is None:
cmd = popenargs[0]
raise subprocess.CalledProcessError(retcode, cmd, output=output)
return output


def ssh_read(host, opts, command):
return subprocess.check_output(
return _check_output(
ssh_command(opts) + ['%s@%s' % (opts.user, host), stringify_command(command)])


Expand Down