ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-27 15:11:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

correctly deal with encoding in errors

Browse source 
fixes #26256
This commit is contained in:
Brian Coca 2017-06-30 13:41:26 -04:00 • committed by Brian Coca
commit 4361659bee
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/ansible/plugins/action/template.py
View file

@ -21,7 +21,7 @@ import os
from ansible import constants as C from ansible import constants as C
from ansible.errors import AnsibleError, AnsibleFileNotFound from ansible.errors import AnsibleError, AnsibleFileNotFound
from ansible.module_utils._text import to_bytes, to_native, to_text from ansible.module_utils._text import to_text
from ansible.plugins.action import ActionBase from ansible.plugins.action import ActionBase
from ansible.template import generate_ansible_template_vars from ansible.template import generate_ansible_template_vars
from ansible.utils.hashing import checksum_s from ansible.utils.hashing import checksum_s
@ -44,7 +44,7 @@ class ActionModule(ActionBase):
dest_stat = self._execute_remote_stat(dest, all_vars=all_vars, follow=False, tmp=tmp) dest_stat = self._execute_remote_stat(dest, all_vars=all_vars, follow=False, tmp=tmp)
except AnsibleError as e: except AnsibleError as e:
return dict(failed=True, msg=to_native(e)) return dict(failed=True, msg=to_text(e))
return dest_stat['checksum'] return dest_stat['checksum']
@ -88,7 +88,7 @@ class ActionModule(ActionBase):
source = self._find_needle('templates', source) source = self._find_needle('templates', source)
except AnsibleError as e: except AnsibleError as e:
result['failed'] = True result['failed'] = True
result['msg'] = to_native(e) result['msg'] = to_text(e)
if 'failed' in result: if 'failed' in result:
return result return result
@ -156,7 +156,7 @@ class ActionModule(ActionBase):
self._templar.set_available_variables(old_vars) self._templar.set_available_variables(old_vars)
except Exception as e: except Exception as e:
result['failed'] = True result['failed'] = True
result['msg'] = type(e).__name__ + ": " + str(e) result['msg'] = "%s: %s" % (type(e).__name__, to_text(e))
return result return result
finally: finally:
self._loader.cleanup_tmp_file(tmp_source) self._loader.cleanup_tmp_file(tmp_source)