mirror of
https://github.com/deadc0de6/dotdrop.git
synced 2026-02-09 09:29:17 +00:00
fix relative cmpignore for #149
This commit is contained in:
@@ -115,9 +115,9 @@ class Comparator:
|
||||
|
||||
def _diff(self, left, right, header=False):
|
||||
"""diff using the unix tool diff"""
|
||||
d = diff(left, right, raw=False,
|
||||
opts=self.diffopts, debug=self.debug)
|
||||
out = diff(left, right, raw=False,
|
||||
opts=self.diffopts, debug=self.debug)
|
||||
if header:
|
||||
lshort = os.path.basename(left)
|
||||
d = '=> diff \"{}\":\n{}'.format(lshort, diff)
|
||||
return d
|
||||
out = '=> diff \"{}\":\n{}'.format(lshort, out)
|
||||
return out
|
||||
|
||||
@@ -245,7 +245,7 @@ def cmd_compare(o, tmp):
|
||||
same = False
|
||||
continue
|
||||
ignores = list(set(o.compare_ignore + dotfile.cmpignore))
|
||||
ignores = patch_ignores(ignores, dotfile.src)
|
||||
ignores = patch_ignores(ignores, dotfile.dst)
|
||||
diff = comp.compare(insttmp, dotfile.dst, ignore=ignores)
|
||||
if tmpsrc:
|
||||
# clean tmp transformed dotfile if any
|
||||
|
||||
Reference in New Issue
Block a user