SoniEx2
/
ganarchy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix crash when loading multiple configs

This commit is contained in:
SoniEx2 2019-06-20 16:50:56 -03:00
parent 0e27c8baf4
commit 7a2b72bc8c
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ganarchy.py
View File

@ -447,7 +447,8 @@ class Config:
self.blocked_domain_suffixes = tuple(self.blocked_domain_suffixes) # MUST be tuple self.blocked_domain_suffixes = tuple(self.blocked_domain_suffixes) # MUST be tuple
# TODO re.compile("(^" + "|^".join(map(re.escape, domains)) + "|" + "|".join(map(re.escape, suffixes) + ")$") # TODO re.compile("(^" + "|^".join(map(re.escape, domains)) + "|" + "|".join(map(re.escape, suffixes) + ")$")
if base: if base:
self._update_projects(base.projects, sanitize=False) # already sanitized # FIXME is remove=remove the right thing to do?
self._update_projects(base.projects, remove=remove, sanitize=False) # already sanitized
projects = config_data.get('projects', {}) projects = config_data.get('projects', {})
self._update_projects(projects, remove=remove) self._update_projects(projects, remove=remove)