cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #12493 from amenonsen/ssh-fds

Browse source 
Fix typo in checking select results
This commit is contained in:
James Cammarata 2015-09-23 13:24:59 -04:00
commit 65f5bed33e
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/ansible/plugins/connection/ssh.py
View file

@ -460,19 +460,19 @@ class Connection(ConnectionBase):
# Read whatever output is available on stdout and stderr, and stop # Read whatever output is available on stdout and stderr, and stop
# listening to the pipe if it's been closed. # listening to the pipe if it's been closed.
elif p.stdout in rfd: if p.stdout in rfd:
chunk = p.stdout.read() chunk = p.stdout.read()
if chunk == '': if chunk == '':
rpipes.remove(p.stdout) rpipes.remove(p.stdout)
tmp_stdout += chunk tmp_stdout += chunk
#self._display.debug("stdout chunk (state=%s):\n>>>%s<<<\n" % (state, chunk)) self._display.debug("stdout chunk (state=%s):\n>>>%s<<<\n" % (state, chunk))
elif p.stderr in rfd: if p.stderr in rfd:
chunk = p.stderr.read() chunk = p.stderr.read()
if chunk == '': if chunk == '':
rpipes.remove(p.stderr) rpipes.remove(p.stderr)
tmp_stderr += chunk tmp_stderr += chunk
#self._display.debug("stderr chunk (state=%s):\n>>>%s<<<\n" % (state, chunk)) self._display.debug("stderr chunk (state=%s):\n>>>%s<<<\n" % (state, chunk))
# We examine the output line-by-line until we have negotiated any # We examine the output line-by-line until we have negotiated any
# privilege escalation prompt and subsequent success/error message. # privilege escalation prompt and subsequent success/error message.
@ -578,7 +578,7 @@ class Connection(ConnectionBase):
just hang forever waiting for more commands.) just hang forever waiting for more commands.)
''' '''
self._display.debug('Sending initial data (%d bytes)' % len(in_data)) self._display.debug('Sending initial data')
try: try:
fh.write(in_data) fh.write(in_data)
@ -586,6 +586,8 @@ class Connection(ConnectionBase):
except (OSError, IOError): except (OSError, IOError):
raise AnsibleConnectionFailure('SSH Error: data could not be sent to the remote host. Make sure this host can be reached over ssh') raise AnsibleConnectionFailure('SSH Error: data could not be sent to the remote host. Make sure this host can be reached over ssh')
self._display.debug('Sent initial data (%d bytes)' % len(in_data))
# This is a separate method because we need to do the same thing for stdout # This is a separate method because we need to do the same thing for stdout
# and stderr. # and stderr.