archive
/
ansible
mirror of https://github.com/ansible/ansible.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix py3 issue in wait_for_connection (#37646)

Browse Source
pull/37024/merge
Matt Martz 7 years ago committed by GitHub
parent f11986c82a
commit 6c3e565ba3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File

3
lib/ansible/plugins/action/wait_for_connection.py
Unescape Escape View File

@ -54,11 +54,12 @@ class ActionModule(ActionBase):
display.debug("wait_for_connection: %s success" % what_desc) display.debug("wait_for_connection: %s success" % what_desc)
return return
except Exception as e: except Exception as e:
error = e # PY3 compatibility to store exception for use outside of this block
if what_desc: if what_desc:
display.debug("wait_for_connection: %s fail (expected), retrying in %d seconds..." % (what_desc, sleep)) display.debug("wait_for_connection: %s fail (expected), retrying in %d seconds..." % (what_desc, sleep))
time.sleep(sleep) time.sleep(sleep)
raise TimedOutException("timed out waiting for %s: %s" % (what_desc, e)) raise TimedOutException("timed out waiting for %s: %s" % (what_desc, error))
def run(self, tmp=None, task_vars=None): def run(self, tmp=None, task_vars=None):
if task_vars is None: if task_vars is None:

Write Preview
Loading…
Cancel
Save