Make sure formatted strings don't bomb on tuples

Fixes #12501
pull/12521/head
James Cammarata 9 years ago
parent 31d5f88a1d
commit eb8d7dcd14

@ -81,7 +81,7 @@ class CallbackModule(CallbackBase):
else: else:
if (self._display.verbosity > 0 or '_ansible_verbose_always' in result._result) and not '_ansible_verbose_override' in result._result and result._task.action != 'include': if (self._display.verbosity > 0 or '_ansible_verbose_always' in result._result) and not '_ansible_verbose_override' in result._result and result._task.action != 'include':
msg += " => %s" % self._dump_results(result._result) msg += " => %s" % (self._dump_results(result._result),)
self._display.display(msg, color=color) self._display.display(msg, color=color)
self._handle_warnings(result._result) self._handle_warnings(result._result)
@ -139,7 +139,7 @@ class CallbackModule(CallbackBase):
msg = "ok: [%s]" % result._host.get_name() msg = "ok: [%s]" % result._host.get_name()
color = 'green' color = 'green'
msg += " => (item=%s)" % result._result['item'] msg += " => (item=%s)" % (result._result['item'],)
if (self._display.verbosity > 0 or '_ansible_verbose_always' in result._result) and not '_ansible_verbose_override' in result._result and result._task.action != 'include': if (self._display.verbosity > 0 or '_ansible_verbose_always' in result._result) and not '_ansible_verbose_override' in result._result and result._task.action != 'include':
msg += " => %s" % self._dump_results(result._result) msg += " => %s" % self._dump_results(result._result)

Loading…
Cancel
Save