arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-26 00:38:10 +00:00
Code Issues Releases Wiki Activity

Fix double loading of config from working directory

Browse Source
This commit is contained in:
Julien Duponchelle 2015-07-03 10:53:41 +02:00
parent e93f1330b8
commit 06e193231c
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gns3server/config.py
View File

@ -66,8 +66,7 @@ class Config(object):
os.path.join(appdata, appname, filename), os.path.join(appdata, appname, filename),
os.path.join(appdata, appname + ".ini"), os.path.join(appdata, appname + ".ini"),
os.path.join(common_appdata, appname, filename), os.path.join(common_appdata, appname, filename),
os.path.join(common_appdata, appname + ".ini"), os.path.join(common_appdata, appname + ".ini")]
filename]
else: else:
# On UNIX-like platforms, the configuration file location can be one of the following: # 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, filename),
os.path.join(home, ".config", appname + ".conf"), os.path.join(home, ".config", appname + ".conf"),
os.path.join("/etc/xdg", appname, filename), os.path.join("/etc/xdg", appname, filename),
os.path.join("/etc/xdg", appname + ".conf"), os.path.join("/etc/xdg", appname + ".conf")]
filename]
if self._files is None: if self._files is None:
self._files = [] self._files = []