ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-28 05:11:25 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixes #6227 skip non-unicode strings and catch decode errors silently in template_from_string

Browse source
This commit is contained in:
James Tanner 2014-03-17 16:54:25 -04:00
parent 8eb547edaa
commit ad70e9bcd6
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/ansible/utils/template.py
View file

@ -310,7 +310,13 @@ def template_from_string(basedir, data, vars, fail_on_undefined=False):
if os.path.exists(filesdir): if os.path.exists(filesdir):
basedir = filesdir basedir = filesdir
data = data.decode('utf-8') # 6227
if isinstance(data, unicode):
try:
data = data.decode('utf-8')
except UnicodeEncodeError, e:
pass
try: try:
t = environment.from_string(data) t = environment.from_string(data)
except Exception, e: except Exception, e: