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

If ssh died, it's an error, not a timeout

Browse source
This commit is contained in:
Abhijit Menon-Sen 2015-11-13 20:10:08 +05:30
parent 31b1abf580
commit 26ea9c4351
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -411,6 +411,10 @@ class Connection(ConnectionBase):
if not rfd: if not rfd:
if state <= states.index('awaiting_escalation'): if state <= states.index('awaiting_escalation'):
# If the process has already exited, then it's not really a
# timeout; we'll let the normal error handling deal with it.
if p.poll() is not None:
break
self._terminate_process(p) self._terminate_process(p)
raise AnsibleError('Timeout (%ds) waiting for privilege escalation prompt: %s' % (timeout, stdout)) raise AnsibleError('Timeout (%ds) waiting for privilege escalation prompt: %s' % (timeout, stdout))