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

add debug to diff

Browse Source
This commit is contained in:
deadc0de6
2018-07-17 21:42:54 +02:00
parent b4e7e775ba
commit 44115fa7d7
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dotdrop/installer.py
View File

@@ -219,7 +219,8 @@ class Installer:
if ret: if ret:
if self.debug: if self.debug:
self.log.dbg('diffing {} and {}'.format(tmpdst, dst)) self.log.dbg('diffing {} and {}'.format(tmpdst, dst))
diff = utils.diff(tmpdst, dst, raw=False, opts=opts) diff = utils.diff(tmpdst, dst, raw=False,
opts=opts, debug=self.debug)
if diff == '': if diff == '':
retval = True, '' retval = True, ''
else: else:

4
dotdrop/utils.py
View File

@@ -29,10 +29,10 @@ def run(cmd, raw=True, debug=False):
return ''.join(lines) return ''.join(lines)
def diff(src, dst, raw=True, opts=''): def diff(src, dst, raw=True, opts='', debug=False):
"""call unix diff to compare two files""" """call unix diff to compare two files"""
cmd = 'diff -r {} \"{}\" \"{}\"'.format(opts, src, dst) cmd = 'diff -r {} \"{}\" \"{}\"'.format(opts, src, dst)
return run(shlex.split(cmd), raw=raw) return run(shlex.split(cmd), raw=raw, debug=debug)
def get_tmpdir(): def get_tmpdir():