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

Merge pull request #23931 from rallytime/bp-23880

Browse Source 
Backport #23880 to 2015.5
This commit is contained in:
Justin Findlay 2015-05-19 15:41:18 -06:00
commit 70bd407920
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/config.py
View File

@ -2182,7 +2182,7 @@ def client_config(path, env_var='SALT_CLIENT_CONFIG', defaults=None):
client_config_dir = xdg_dir client_config_dir = xdg_dir
saltrc_config_file = 'saltrc' saltrc_config_file = 'saltrc'
else: else:
client_config_dir = '~' client_config_dir = os.path.expanduser('~')
saltrc_config_file = '.saltrc' saltrc_config_file = '.saltrc'
# Get the token file path from the provided defaults. If not found, specify # Get the token file path from the provided defaults. If not found, specify