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

fix for grains_cache setting on windows

Browse Source
This commit is contained in:
Matthew Hopkins 2014-03-05 15:53:33 -05:00
parent e51d91c269
commit 114391ac9e
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
salt/loader.py
View File

@ -17,6 +17,13 @@ from salt.exceptions import LoaderError
from salt.template import check_render_pipe_str
from salt.utils.decorators import Depends
# Solve the Chicken and egg problem where grains need to run before any
# of the modules are loaded and are generally available for any usage.
import salt.modules.cmdmod
__salt__ = {
'cmd.run': salt.modules.cmdmod._run_quiet
}
log = logging.getLogger(__name__)
SALT_BASE_PATH = os.path.dirname(salt.__file__)
@ -1051,7 +1058,7 @@ class Loader(object):
try:
if salt.utils.is_windows():
# Make sure cache file isn't read-only
self.state.functions['cmd.run']('attrib -R "{0}"'.format(cfn), output_loglevel='quiet')
__salt__['cmd.run']('attrib -R "{0}"'.format(cfn))
with salt.utils.fopen(cfn, 'w+b') as fp_:
try:
self.serial.dump(grains_data, fp_)