From 31a951c4f7c14ce69d1fd4c2ab11aba0285abeab Mon Sep 17 00:00:00 2001 From: Brian Coca Date: Wed, 13 Jan 2016 10:17:43 -0500 Subject: [PATCH] only send event if tqm exists fixes #13843 --- Makefile | 3 +++ lib/ansible/executor/playbook_executor.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f62cffb2df8..367987affce 100644 --- a/Makefile +++ b/Makefile @@ -167,6 +167,9 @@ install: sdist: clean docs $(PYTHON) setup.py sdist +sdist_upload: clean docs + $(PYTHON) setup.py sdist upload 2>&1 |tee upload.log + rpmcommon: $(MANPAGES) sdist @mkdir -p rpm-build @cp dist/*.gz rpm-build/ diff --git a/lib/ansible/executor/playbook_executor.py b/lib/ansible/executor/playbook_executor.py index f9b05073009..bdb08993e3f 100644 --- a/lib/ansible/executor/playbook_executor.py +++ b/lib/ansible/executor/playbook_executor.py @@ -111,8 +111,8 @@ class PlaybookExecutor: salt = var.get("salt", None) if vname not in self._variable_manager.extra_vars: - self._tqm.send_callback('v2_playbook_on_vars_prompt', vname, private, prompt, encrypt, confirm, salt_size, salt, default) if self._tqm: + self._tqm.send_callback('v2_playbook_on_vars_prompt', vname, private, prompt, encrypt, confirm, salt_size, salt, default) play.vars[vname] = display.do_var_prompt(vname, private, prompt, encrypt, confirm, salt_size, salt, default) else: # we are either in --list-