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

Merge pull request #14537 from Yannig/devel_better_error_handling

Browse source 
Improve message content to get more hint about the raised error.
This commit is contained in:
Brian Coca 2016-03-03 18:11:04 -05:00
commit b901b15d3b
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -21,6 +21,7 @@ __metaclass__ = type
from ansible.compat.six import iteritems from ansible.compat.six import iteritems
from jinja2.utils import missing from jinja2.utils import missing
from ansible.utils.unicode import to_unicode
__all__ = ['AnsibleJ2Vars'] __all__ = ['AnsibleJ2Vars']
@ -83,7 +84,12 @@ class AnsibleJ2Vars:
if isinstance(variable, dict) and varname == "vars" or isinstance(variable, HostVars): if isinstance(variable, dict) and varname == "vars" or isinstance(variable, HostVars):
return variable return variable
else: else:
return self._templar.template(variable) value = None
try:
value = self._templar.template(variable)
except Exception as e:
raise type(e)(to_unicode(variable) + ': ' + e.message)
return value
def add_locals(self, locals): def add_locals(self, locals):
''' '''