Backport #37646 for 2.5 (#37653)

* Fix py3 issue in wait_for_connection (#37646)

(cherry picked from commit 6c3e565ba3)

* Add changelog entry for #36470
pull/38044/merge
Matt Martz 8 years ago committed by GitHub
parent 617d156eac
commit e33f1777fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -0,0 +1,2 @@
bugfixes:
- wait_for_connection - Fix python3 compatibility bug (https://github.com/ansible/ansible/pull/37646)

@ -54,11 +54,12 @@ class ActionModule(ActionBase):
display.debug("wait_for_connection: %s success" % what_desc)
return
except Exception as e:
error = e # PY3 compatibility to store exception for use outside of this block
if what_desc:
display.debug("wait_for_connection: %s fail (expected), retrying in %d seconds..." % (what_desc, 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):
if task_vars is None:

Loading…
Cancel
Save