Merge branch 'fix-configuration-file-location' into 'master'
Fix configuration file location See merge request ungleich-public/cdist!863
This commit is contained in:
commit
80d204368a
1 changed files with 2 additions and 1 deletions
|
@ -274,7 +274,8 @@ class Configuration(metaclass=Singleton):
|
|||
os.path.isfile(_local_config_file))):
|
||||
_local_config_file = os.path.join(
|
||||
os.environ.get('XDG_CONFIG_HOME',
|
||||
os.path.expanduser('~/.config/cdist')),
|
||||
os.path.expanduser('~/.config/')),
|
||||
'cdist',
|
||||
_config_basename)
|
||||
_dist_config_file = os.path.join(
|
||||
os.path.abspath(os.path.join(os.path.dirname(cdist.__file__), "conf")),
|
||||
|
|
Loading…
Reference in a new issue