Browse code

only send event if tqm exists

fixes #13843

Brian Coca authored on 2016/01/14 00:17:43
Showing 2 changed files
... ...
@@ -167,6 +167,9 @@ install:
167 167
 sdist: clean docs
168 168
 	$(PYTHON) setup.py sdist
169 169
 
170
+sdist_upload: clean docs
171
+	$(PYTHON) setup.py sdist upload 2>&1 |tee upload.log
172
+
170 173
 rpmcommon: $(MANPAGES) sdist
171 174
 	@mkdir -p rpm-build
172 175
 	@cp dist/*.gz rpm-build/
... ...
@@ -112,8 +112,8 @@ class PlaybookExecutor:
112 112
                             salt      = var.get("salt", None)
113 113
 
114 114
                             if vname not in self._variable_manager.extra_vars:
115
-                                self._tqm.send_callback('v2_playbook_on_vars_prompt', vname, private, prompt, encrypt, confirm, salt_size, salt, default)
116 115
                                 if self._tqm:
116
+                                    self._tqm.send_callback('v2_playbook_on_vars_prompt', vname, private, prompt, encrypt, confirm, salt_size, salt, default)
117 117
                                     play.vars[vname] = display.do_var_prompt(vname, private, prompt, encrypt, confirm, salt_size, salt, default)
118 118
                                 else: # we are either in --list-<option> or syntax check
119 119
                                     play.vars[vname] = default