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

Merge pull request #5175 from basepi/context5161

Browse Source 
Make explicit context overwrite kwargs for templating, Fix #5161
This commit is contained in:
David Boucha 2013-05-21 12:39:48 -07:00
commit 0c8e0fc569
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

@ -38,7 +38,9 @@ def wrap_tmpl_func(render_str):
context=None, tmplpath=None, **kws): context=None, tmplpath=None, **kws):
if context is None: if context is None:
context = {} context = {}
context.update(kws) # We want explicit context to overwrite the **kws
kws.update(context)
context = kws
assert 'opts' in context assert 'opts' in context
assert 'env' in context assert 'env' in context