saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #28512 from basepi/merge-forward-2015.5

Browse source 
[2015.5] Merge forward from 2014.7 to 2015.5
This commit is contained in:
Colton Myers 2015-11-02 17:38:08 -07:00
commit 63ce8f78d5
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/modules/state.py
View file

@ -680,12 +680,13 @@ def sls(mods,
)
st_ = salt.state.HighState(opts, pillar, kwargs.get('__pub_jid'))
umask = os.umask(0o77)
if kwargs.get('cache'):
if os.path.isfile(cfn):
with salt.utils.fopen(cfn, 'rb') as fp_:
high_ = serial.load(fp_)
return st_.state.call_high(high_)
os.umask(umask)
if isinstance(mods, string_types):
mods = mods.split(',')
@ -722,11 +723,11 @@ def sls(mods,
msg = 'Unable to write to SLS cache file {0}. Check permission.'
log.error(msg.format(cache_file))
os.umask(cumask)
_set_retcode(ret)
# Work around Windows multiprocessing bug, set __opts__['test'] back to
# value from before this function was run.
__opts__['test'] = orig_test
try:
with salt.utils.fopen(cfn, 'w+b') as fp_:
try:
@ -737,6 +738,7 @@ def sls(mods,
except (IOError, OSError):
msg = 'Unable to write to highstate cache file {0}. Do you have permissions?'
log.error(msg.format(cfn))
os.umask(cumask)
return ret