Merge branch 'master' into 2.2

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

1
.gitignore vendored
View File

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

View File

@ -45,6 +45,9 @@ class Config:
self._files = files
self._profile = profile
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]
else:
self._main_config_file = None