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

ensure ignore are respected

Browse Source
This commit is contained in:
deadc0de6
2020-12-11 19:45:03 +01:00
parent f6ac82082f
commit 2e0bab0ba2
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dotdrop/dotdrop.py
View File

@@ -134,8 +134,11 @@ def _dotfile_compare(o, dotfile, tmp):
LOG.dbg('points to itself')
return True
ignores = list(set(o.compare_ignore + dotfile.cmpignore))
ignores = patch_ignores(ignores, dotfile.dst, debug=o.debug)
insttmp = None
if dotfile.template and Templategen.is_template(src):
if dotfile.template and Templategen.is_template(src, ignore=ignores):
# install dotfile to temporary dir for compare
ret, err, insttmp = inst.install_to_temp(t, tmp, src, dotfile.dst,
is_template=True,
@@ -149,8 +152,6 @@ def _dotfile_compare(o, dotfile, tmp):
src = insttmp
# compare
ignores = list(set(o.compare_ignore + dotfile.cmpignore))
ignores = patch_ignores(ignores, dotfile.dst, debug=o.debug)
diff = comp.compare(src, dotfile.dst, ignore=ignores)
# clean tmp transformed dotfile if any
@@ -220,6 +221,7 @@ def _dotfile_install(o, dotfile, tmpdir=None):
dotfile.link,
actionexec=pre_actions_exec,
is_template=is_template,
ignore=ignores,
chmod=dotfile.chmod)
elif hasattr(dotfile, 'link') and \
dotfile.link == LinkTypes.LINK_CHILDREN:
@@ -239,8 +241,6 @@ def _dotfile_install(o, dotfile, tmpdir=None):
if not tmp:
return False, dotfile.key, None
src = tmp
ignores = list(set(o.install_ignore + dotfile.instignore))
ignores = patch_ignores(ignores, dotfile.dst, debug=o.debug)
r, err = inst.install(t, src, dotfile.dst,
LinkTypes.NOLINK,
actionexec=pre_actions_exec,