Mercurial > libervia-backend
changeset 3145:3f414c897e70
core (constants): don't parse `sat.conf` from current dir anymore + parse root_dir last
author | Goffi <goffi@goffi.org> |
---|---|
date | Wed, 29 Jan 2020 19:12:46 +0100 (2020-01-29) |
parents | 02325c3141dd |
children | 320b762cbdf0 |
files | sat/core/constants.py |
diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/sat/core/constants.py Wed Jan 29 19:05:41 2020 +0100 +++ b/sat/core/constants.py Wed Jan 29 19:12:46 2020 +0100 @@ -455,11 +455,12 @@ import os root_dir = Path(sat.__file__).parent Const.CONFIG_PATHS = ( - ["/etc/", "~/", "~/.", "", root_dir, "."] + ["/etc/", "~/", "~/."] + [ "%s/" % path for path in list(BaseDirectory.load_config_paths(Const.APP_NAME_FILE)) ] + + [root_dir] ) # on recent versions of Flatpak, FLATPAK_ID is set at run time