mirrors/dotdrop
1
0
Fork 0
mirror of https://github.com/deadc0de6/dotdrop.git synced 2026-02-04 14:31:46 +00:00
Code Activity

fix precedence for #443

Browse Source
This commit is contained in:
deadc0de6
2024-11-06 14:44:55 +01:00
parent b53f9396ec
commit e7335ec44e
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
dotdrop/cfg_yaml.py
View File

@@ -1096,14 +1096,14 @@ class CfgYaml:
]
# merge top entries
self.dotfiles = self._merge_dict(self.dotfiles, sub.dotfiles)
self.profiles = self._merge_dict(self.profiles, sub.profiles,
self.dotfiles = self._merge_dict(sub.dotfiles, self.dotfiles)
self.profiles = self._merge_dict(sub.profiles, self.profiles,
deep=True)
self.actions = self._merge_dict(self.actions, sub.actions)
self.trans_install = self._merge_dict(self.trans_install,
sub.trans_install)
self.trans_update = self._merge_dict(self.trans_update,
sub.trans_update)
self.actions = self._merge_dict(sub.actions, self.actions)
self.trans_install = self._merge_dict(sub.trans_install,
self.trans_install)
self.trans_update = self._merge_dict(sub.trans_update,
self.trans_update)
self._clear_profile_vars(sub.variables)
self.imported_configs.append(path)
@@ -1693,6 +1693,7 @@ class CfgYaml:
"""
both dict must be the same form/type
if deep is True, then merge recursively
high dict entries take precedence over low dict
"""
if not high:
high = {}