wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5131 from janeznemanic/devel

Browse source 
Fix for issue #4730 - stacktrace when deferenencing a non-existent group
This commit is contained in:
jctanner 2013-12-13 11:00:41 -08:00
commit 1679d83637
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -532,13 +532,14 @@ def template_from_string(basedir, data, vars, fail_on_undefined=False):
return lookup(*args, basedir=basedir, **kwargs)
t.globals['lookup'] = my_lookup
jvars =_jinja2_vars(basedir, vars, t.globals, fail_on_undefined)
new_context = t.new_context(jvars, shared=True)
rf = t.root_render_func(new_context)
res = jinja2.utils.concat(rf)
try:
res = jinja2.utils.concat(rf)
except TypeError, te:
if 'StrictUndefined' in str(te):
raise errors.AnsibleUndefinedVariable("unable to look up a name or access an attribute in template string")
return res
except (jinja2.exceptions.UndefinedError, errors.AnsibleUndefinedVariable):
if fail_on_undefined: