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

Merge pull request #12718 from hulu/xdg-fix

Browse Source 
xdg_config_dir(): fix os.path.expand [sic] typo, and refactor
This commit is contained in:
Pedro Algarvio 2014-05-13 02:14:09 +01:00
commit cac7abf185
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
salt/utils/xdg.py
View File

@ -15,6 +15,7 @@ def xdg_config_dir(config_dir=None):
return xdg_config_directory return xdg_config_directory
else: else:
if config_dir is None: if config_dir is None:
return os.path.expanduser('~/.') config_dir = '~/.'
else: else:
return os.path.expand(os.path.join('~/.', config_dir)) config_dir = os.path.join('~/.', config_dir)
return os.path.expanduser(config_dir)