From 6c3e565ba3e71dbba695c675e98cfaaee8aa0727 Mon Sep 17 00:00:00 2001 From: Matt Martz Date: Tue, 20 Mar 2018 11:21:19 -0500 Subject: [PATCH] Fix py3 issue in wait_for_connection (#37646) --- lib/ansible/plugins/action/wait_for_connection.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/ansible/plugins/action/wait_for_connection.py b/lib/ansible/plugins/action/wait_for_connection.py index 1f777e8b81d..45473684b04 100644 --- a/lib/ansible/plugins/action/wait_for_connection.py +++ b/lib/ansible/plugins/action/wait_for_connection.py @@ -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: