arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-17 22:08:35 +00:00
Code Issues Releases Wiki Activity

Support server config in current working directory

Browse Source
This commit is contained in:
Julien Duponchelle 2015-07-01 17:30:52 +02:00
parent 472faa97c5
commit caf7af7ad5
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gns3server/config.py
View File

@ -62,7 +62,8 @@ class Config(object):
common_appdata = os.path.expandvars("%COMMON_APPDATA%")
filename = "gns3_server.ini"
if self._files is None:
self._files = [os.path.join(appdata, appname, filename),
self._files = [os.path.join(os.getcwd(), filename),
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"),
@ -80,7 +81,8 @@ class Config(object):
home = os.path.expanduser("~")
filename = "gns3_server.conf"
if self._files is None:
self._files = [os.path.join(home, ".config", appname, filename),
self._files = [os.path.join(os.getcwd(), filename),
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"),