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

Minor cleanup

Browse Source
This commit is contained in:
Jeff Schroeder 2012-07-01 16:50:46 -07:00
parent d6cff0e698
commit d81f208204
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
salt/client.py
View File

@ -82,14 +82,16 @@ class LocalClient(object):
'''
Read in the rotating master authentication key
'''
keyfile = os.path.join(self.opts['cachedir'], '.root_key')
# Make sure all key parent directories are accessible
user = self.opts.get('user', 'root')
salt.utils.verify.check_parent_dirs(keyfile, user)
try:
keyfile = os.path.join(self.opts['cachedir'], '.root_key')
# Make sure all key parent directories are accessible
user = self.opts.get('user', 'root')
salt.utils.verify.check_parent_dirs(keyfile, user)
with open(keyfile, 'r') as KEY:
return KEY.read()
except (OSError, IOError):
# In theory, this should never get hit. Belt & suspenders baby!
raise SaltClientError(('Problem reading the salt root key. Are'
' you root?'))