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

remove argument from xdg_config_dir

Browse Source 
Closes #13699
This commit is contained in:
Daniel Wallace 2014-06-24 18:08:57 -05:00
parent 2b16eea71c
commit ac8b639853
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/utils/parsers.py
View File

@ -664,7 +664,9 @@ class LogLevelMixIn(object):
if current_user in self.config.get('client_acl', {}).keys():
# Yep, the user is in ACL!
# Let's write the logfile to its home directory instead.
user_salt_dir = salt.utils.xdg.xdg_config_dir('salt')
xdg_dir = salt.utils.xdg.xdg_config_dir()
user_salt_dir = xdg_dir if os.path.isdir(xdg_dir) else '~/.salt'
if not os.path.isdir(user_salt_dir):
os.makedirs(user_salt_dir, 0750)
logfile_basename = os.path.basename(

2
salt/utils/xdg.py
View File

@ -5,7 +5,7 @@ Create an XDG function to get the config dir
import os
def xdg_config_dir(config_dir=None):
def xdg_config_dir():
'''
Check xdg locations for config files
'''