mirror of
https://github.com/GNS3/gns3-server
synced 2024-12-25 16:28:11 +00:00
Fix double loading of config from working directory
This commit is contained in:
parent
e93f1330b8
commit
06e193231c
@ -66,8 +66,7 @@ class Config(object):
|
||||
os.path.join(appdata, appname, filename),
|
||||
os.path.join(appdata, appname + ".ini"),
|
||||
os.path.join(common_appdata, appname, filename),
|
||||
os.path.join(common_appdata, appname + ".ini"),
|
||||
filename]
|
||||
os.path.join(common_appdata, appname + ".ini")]
|
||||
else:
|
||||
|
||||
# On UNIX-like platforms, the configuration file location can be one of the following:
|
||||
@ -85,8 +84,7 @@ class Config(object):
|
||||
os.path.join(home, ".config", appname, filename),
|
||||
os.path.join(home, ".config", appname + ".conf"),
|
||||
os.path.join("/etc/xdg", appname, filename),
|
||||
os.path.join("/etc/xdg", appname + ".conf"),
|
||||
filename]
|
||||
os.path.join("/etc/xdg", appname + ".conf")]
|
||||
|
||||
if self._files is None:
|
||||
self._files = []
|
||||
|
Loading…
Reference in New Issue
Block a user