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 #30666 from cachedout/grains_cache_fix

Browse source 
Fix grains cache
This commit is contained in:
Colton Myers 2016-01-27 15:23:11 -07:00
commit 9f0e97693c
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/loader.py
View file

@ -645,6 +645,7 @@ def grains(opts, force_refresh=False, proxy=None):
continue
grains_data.update(ret)
grains_data.update(opts['grains'])
# Write cache if enabled
if opts.get('grains_cache', False):
cumask = os.umask(0o77)
@ -664,7 +665,6 @@ def grains(opts, force_refresh=False, proxy=None):
log.error(msg.format(cfn))
os.umask(cumask)
grains_data.update(opts['grains'])
return grains_data