mirrors/dotdrop
1
0
Fork 0
mirror of https://github.com/deadc0de6/dotdrop.git synced 2026-02-05 21:23:02 +00:00
Code Activity

fix relative cmpignore for #149

Browse Source
This commit is contained in:
deadc0de6
2019-06-09 13:44:18 +02:00
parent bbe6bc76fe
commit acc2c83e22
4 changed files with 64 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
dotdrop/dotdrop.py
View File

@@ -221,6 +221,8 @@ def cmd_compare(o, tmp):
tmpsrc = None
if dotfile.trans_r:
# apply transformation
if o.debug:
LOG.dbg('applying transformation before comparing')
tmpsrc = apply_trans(o.dotpath, dotfile, debug=o.debug)
if not tmpsrc:
# could not apply trans
@@ -245,7 +247,7 @@ def cmd_compare(o, tmp):
same = False
continue
ignores = list(set(o.compare_ignore + dotfile.cmpignore))
ignores = patch_ignores(ignores, dotfile.dst)
ignores = patch_ignores(ignores, dotfile.dst, debug=o.debug)
diff = comp.compare(insttmp, dotfile.dst, ignore=ignores)
if tmpsrc:
# clean tmp transformed dotfile if any
@@ -570,6 +572,9 @@ def main():
LOG.err('config file error: {}'.format(str(e)))
return False
if o.debug:
LOG.dbg('\n\n')
ret = True
try: