mirrors/dotdrop
1
0
Fork 0
mirror of https://github.com/deadc0de6/dotdrop.git synced 2026-02-11 13:44:16 +00:00
Code Activity

Merge pull request #140 from davla/fix-import-config-vars

Browse Source 
[hotfix] imported configs variables were not merged in
This commit is contained in:
deadc0de
2019-05-21 10:37:18 +02:00
committed by GitHub
parent 9f94f14b87 2673c024de
commit 7a0f4408ee
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dotdrop/config.py
View File

@@ -610,12 +610,12 @@ class Cfg:
variables = { variables = {
k: v k: v
for k, v in ext_config._get_variables(None).items() for k, v in ext_config._get_variables(None).items()
if k not in self.content[self.key_variables] if k not in self._get_variables(None).keys()
} }
dyn_variables = { dyn_variables = {
k: v k: v
for k, v in ext_config._get_dynvariables(None).items() for k, v in ext_config._get_dynvariables(None).items()
if k not in self.content[self.key_dynvariables] if k not in self._get_dynvariables(None).keys()
} }
self._merge_dict(ext_config=ext_config, warning_prefix='Variable', self._merge_dict(ext_config=ext_config, warning_prefix='Variable',
self_member=self.ext_variables, self_member=self.ext_variables,