summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToshio Kuratomi <toshio@fedoraproject.org>2016-01-18 14:42:50 -0800
committerToshio Kuratomi <toshio@fedoraproject.org>2016-01-18 14:43:55 -0800
commit5e18bc595544d8abd1854f81af8a875307415d07 (patch)
tree92b934a92a162ce460ad69199e9a3f23e6975457
parent11ca4e6282a055783e33c831d5480a5a58280138 (diff)
downloadansible-5e18bc595544d8abd1854f81af8a875307415d07.tar.gz
Turn results that come from traceback messages into unicode, not str.
Fixes #13964 Fixes #13967
-rw-r--r--lib/ansible/plugins/strategy/__init__.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/ansible/plugins/strategy/__init__.py b/lib/ansible/plugins/strategy/__init__.py
index 00744dbf73..0b7f48b563 100644
--- a/lib/ansible/plugins/strategy/__init__.py
+++ b/lib/ansible/plugins/strategy/__init__.py
@@ -39,6 +39,7 @@ from ansible.playbook.helpers import load_list_of_blocks
from ansible.playbook.included_file import IncludedFile
from ansible.plugins import action_loader, connection_loader, filter_loader, lookup_loader, module_loader, test_loader
from ansible.template import Templar
+from ansible.utils.unicode import to_unicode
from ansible.vars.unsafe_proxy import wrap_var
from ansible.vars import combine_vars
@@ -465,7 +466,7 @@ class StrategyBase:
# mark all of the hosts including this file as failed, send callbacks,
# and increment the stats for this host
for host in included_file._hosts:
- tr = TaskResult(host=host, task=included_file._task, return_data=dict(failed=True, reason=str(e)))
+ tr = TaskResult(host=host, task=included_file._task, return_data=dict(failed=True, reason=to_unicode(e)))
iterator.mark_host_failed(host)
self._tqm._failed_hosts[host.name] = True
self._tqm._stats.increment('failures', host.name)