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

Merge pull request #5134 from hulu/state-high-shadowing

Browse Source 
state.py: high => high_, to avoid shadowing the func
This commit is contained in:
Thomas S Hatch 2013-05-18 08:45:45 -07:00
commit 4ce50a05e6
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
salt/modules/state.py
View File

@ -259,15 +259,15 @@ def sls(mods, env='base', test=None, exclude=None, **kwargs):
if kwargs.get('cache'):
if os.path.isfile(cfn):
with open(cfn, 'r') as fp_:
high = serial.load(fp_)
return st_.state.call_high(high)
high_ = serial.load(fp_)
return st_.state.call_high(high_)
if isinstance(mods, string_types):
mods = mods.split(',')
st_.push_active()
try:
high, errors = st_.render_highstate({env: mods})
high_, errors = st_.render_highstate({env: mods})
if errors:
__context__['retcode'] = 1
@ -276,11 +276,11 @@ def sls(mods, env='base', test=None, exclude=None, **kwargs):
if exclude:
if isinstance(exclude, str):
exclude = exclude.split(',')
if '__exclude__' in high:
high['__exclude__'].extend(exclude)
if '__exclude__' in high_:
high_['__exclude__'].extend(exclude)
else:
high['__exclude__'] = exclude
ret = st_.state.call_high(high)
high_['__exclude__'] = exclude
ret = st_.state.call_high(high_)
finally:
st_.pop_active()
if __salt__['config.option']('state_data', '') == 'terse' or kwargs.get('terse'):
@ -294,7 +294,7 @@ def sls(mods, env='base', test=None, exclude=None, **kwargs):
log.error(msg.format(cache_file))
_set_retcode(ret)
with open(cfn, 'w+') as fp_:
serial.dump(high, fp_)
serial.dump(high_, fp_)
return ret
@ -383,12 +383,12 @@ def show_sls(mods, env='base', test=None, **kwargs):
st_ = salt.state.HighState(opts)
if isinstance(mods, string_types):
mods = mods.split(',')
high, errors = st_.render_highstate({env: mods})
errors += st_.state.verify_high(high)
high_, errors = st_.render_highstate({env: mods})
errors += st_.state.verify_high(high_)
if errors:
__context__['retcode'] = 1
return errors
return high
return high_
def show_top():