valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #10307 from makinacorpus/jinja_in

Browse Source 
Be sure not to loose any var in case of multi macro inheritance
This commit is contained in:
Thomas S Hatch 2014-02-11 15:11:09 -07:00
commit a822717eb8
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/utils/templates.py
View File

@ -258,7 +258,9 @@ def render_jinja_tmpl(tmplstr, context, tmplpath=None):
unicode_context[key] = unicode(value, 'utf-8')
try:
output = jinja_env.from_string(tmplstr).render(**unicode_context)
template = jinja_env.from_string(tmplstr)
template.globals.update(unicode_context)
output = template.render(**unicode_context)
except jinja2.exceptions.TemplateSyntaxError as exc:
trace = traceback.extract_tb(sys.exc_info()[2])
line, out = _get_jinja_error(trace, context=unicode_context)