Merge pull request #12493 from amenonsen/ssh-fds

Fix typo in checking select results

lib/ansible/plugins/connection/ssh.py

@@ -460,19 +460,19 @@ class Connection(ConnectionBase):
             # Read whatever output is available on stdout and stderr, and stop
             # listening to the pipe if it's been closed.
 
-            elif p.stdout in rfd:
+            if p.stdout in rfd:
                 chunk = p.stdout.read()
                 if chunk == '':
                     rpipes.remove(p.stdout)
                 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()
                 if chunk == '':
                     rpipes.remove(p.stderr)
                 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
             # privilege escalation prompt and subsequent success/error message.
@@ -578,7 +578,7 @@ class Connection(ConnectionBase):
         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:
             fh.write(in_data)
@@ -586,6 +586,8 @@ class Connection(ConnectionBase):
         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')
 
+        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
     # and stderr.