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

Merge pull request #15815 from hulu/high-shadowing

Browse Source 
modules.state.template: avoid shadowing high() func
This commit is contained in:
Thomas S Hatch 2014-09-16 09:42:15 -06:00
commit c23660960f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/modules/state.py
View File

@ -216,11 +216,11 @@ def template(tem, queue=False, **kwargs):
st_ = salt.state.HighState(__opts__)
if not tem.endswith('.sls'):
tem = '{sls}.sls'.format(sls=tem)
high, errors = st_.render_state(tem, None, '', None, local=True)
high_state, errors = st_.render_state(tem, None, '', None, local=True)
if errors:
__context__['retcode'] = 1
return errors
ret = st_.state.call_high(high)
ret = st_.state.call_high(high_state)
_set_retcode(ret)
return ret