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

Use the already existing context keyword.

Browse Source
This commit is contained in:
Pedro Algarvio 2013-09-16 00:02:03 +01:00
parent 26bac77312
commit 6f53c6dbae
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/utils/__init__.py
View File

@ -772,15 +772,15 @@ def format_call(fun, data, initial_ret=None, expected_extra_kws=()):
# Return a warning to the user explaining what's going on
ret.setdefault('warnings', []).append(
'{0}. If you were trying to pass additional data to be used '
'in a template context, please pass a dictionary to '
'\'template_context\'. Your approach will work until salt>=0.20.0 '
'in a template context, please populate \'context\' with '
'\'key: val\' pairs. Your approach will work until salt>=0.20.0 '
'is out.{1}'.format(
msg,
'' if 'full' not in ret else ' Please update your state files.'
)
)
# Lets set the current extra kwargs as kwargs for the template context
ret.setdefault('template_context', {}).update(extra)
ret.setdefault('context', {}).update(extra)
return ret