cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Convert exceptions to unicode using to_unicode rather than str. that stops unicode errors if the string has non-ascii text

Browse source
This commit is contained in:
Toshio Kuratomi 2015-03-25 13:56:46 -07:00
parent aaa25eb75c
commit 38892e986e
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
v2/ansible/executor/task_executor.py
View file

@ -26,6 +26,7 @@ from ansible.playbook.conditional import Conditional
from ansible.playbook.task import Task from ansible.playbook.task import Task
from ansible.plugins import lookup_loader, connection_loader, action_loader from ansible.plugins import lookup_loader, connection_loader, action_loader
from ansible.utils.listify import listify_lookup_plugin_terms from ansible.utils.listify import listify_lookup_plugin_terms
from ansible.utils.unicode import to_unicode
from ansible.utils.debug import debug from ansible.utils.debug import debug
@ -89,7 +90,7 @@ class TaskExecutor:
debug("done dumping result, returning") debug("done dumping result, returning")
return result return result
except AnsibleError, e: except AnsibleError, e:
return dict(failed=True, msg=str(e)) return dict(failed=True, msg=to_unicode(e, nonstring='simplerepr'))
def _get_loop_items(self): def _get_loop_items(self):
''' '''