Garmelon/evering
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Set base_dir at the appropriate time

Browse source
This commit is contained in:
Joscha 2019-12-09 17:42:00 +00:00
parent 258b7a4719
commit 381e50dec6
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
evering/config.py
View file

@ -208,6 +208,9 @@ class Config:
May raise: ConfigurationException May raise: ConfigurationException
""" """
if not "base_dir" in self.local_vars:
self.local_vars["base_dir"] = path.parent
try: try:
safer_exec(read_file(path), self.local_vars) safer_exec(read_file(path), self.local_vars)
except (ReadFileException, ExecuteException) as e: except (ReadFileException, ExecuteException) as e:
@ -215,9 +218,6 @@ class Config:
logger.debug(error_msg) logger.debug(error_msg)
raise ConfigurationException(error_msg) raise ConfigurationException(error_msg)
else: else:
if not "base_dir" in self.local_vars:
self.local_vars["base_dir"] = path.parent
logger.info(f"Loaded config from {style_path(path)}") logger.info(f"Loaded config from {style_path(path)}")
def copy(self) -> "Config": def copy(self) -> "Config":