NgTech-LTD/gns3-server
2
0 Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2026-11-03 05:51:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix double loading of config from working directory

Browse Source
This commit is contained in:
Julien Duponchelle committed 2015-07-03 10:53:41 +02:00
1 parent e93f1330b8
commit 06e193231c
1 file changed
+2 -4
Download Patch File Download Diff File Expand all files Collapse all files
gns3server/config.py
+2 -4
View File
@@ -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 = []