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

Merge branch 'master' into 2.2

Browse Source
This commit is contained in:
grossmj 2019-11-12 15:20:12 +08:00
commit 4daaea9cec
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -58,4 +58,5 @@ startup.vpcs
# Virtualenv # Virtualenv
env env
venv
.ropeproject .ropeproject

3
gns3server/config.py
View File

@ -45,6 +45,9 @@ class Config:
self._files = files self._files = files
self._profile = profile self._profile = profile
if files and len(files): if files and len(files):
directory_name = os.path.dirname(files[0])
if not directory_name or directory_name == "":
files[0] = os.path.dirname(os.path.abspath(files[0])) + os.path.sep + files[0]
self._main_config_file = files[0] self._main_config_file = files[0]
else: else:
self._main_config_file = None self._main_config_file = None