mirror of
https://github.com/valitydev/salt.git
synced 2024-11-07 08:58:59 +00:00
Merge pull request #23931 from rallytime/bp-23880
Backport #23880 to 2015.5
This commit is contained in:
commit
70bd407920
@ -2182,7 +2182,7 @@ def client_config(path, env_var='SALT_CLIENT_CONFIG', defaults=None):
|
||||
client_config_dir = xdg_dir
|
||||
saltrc_config_file = 'saltrc'
|
||||
else:
|
||||
client_config_dir = '~'
|
||||
client_config_dir = os.path.expanduser('~')
|
||||
saltrc_config_file = '.saltrc'
|
||||
|
||||
# Get the token file path from the provided defaults. If not found, specify
|
||||
|
Loading…
Reference in New Issue
Block a user