Create a new pipe for sshpass on retries. Fixes #29095

(cherry picked from commit d043ba2673)
pull/29989/head
Matt Martz 8 years ago committed by Toshio Kuratomi
parent 09d38049eb
commit b8e02b0dc1

@ -72,6 +72,12 @@ def _ssh_retry(func):
remaining_tries = int(C.ANSIBLE_SSH_RETRIES) + 1
cmd_summary = "%s..." % args[0]
for attempt in range(remaining_tries):
cmd = args[0]
if attempt != 0 and self._play_context.password and isinstance(cmd, list):
# If this is a retry, the fd/pipe for sshpass is closed, and we need a new one
self.sshpass_pipe = os.pipe()
cmd[1] = b'-d' + to_bytes(self.sshpass_pipe[0], nonstring='simplerepr', errors='surrogate_or_strict')
try:
try:
return_tuple = func(self, *args, **kwargs)

Loading…
Cancel
Save