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

One more check for presence of __proxy__

Browse Source
This commit is contained in:
C. R. Oldham 2015-10-08 16:21:23 -06:00
parent 62d9f5092e
commit ed23f36279
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
salt/modules/state.py
View File

@ -685,10 +685,10 @@ def sls(mods,
'{0}.cache.p'.format(kwargs.get('cache_name', 'highstate'))
)
# try:
st_ = salt.state.HighState(opts, pillar, kwargs.get('__pub_jid'), proxy=__proxy__)
# except NameError:
# st_ = salt.state.HighState(opts, pillar, kwargs.get('__pub_jid'))
try:
st_ = salt.state.HighState(opts, pillar, kwargs.get('__pub_jid'), proxy=__proxy__)
except NameError:
st_ = salt.state.HighState(opts, pillar, kwargs.get('__pub_jid'))
if kwargs.get('cache'):
if os.path.isfile(cfn):