HA
/
patool
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not use diff -B.

This commit is contained in:
Bastian Kleineidam 2010-03-18 19:25:42 +01:00
parent 7a901a2d3f
commit 5e21670b8e
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/changelog.txt
View File

@ -1,3 +1,7 @@
0.9 "" (released xx.xx.2010)
* Do not use the diff -B option when comparing archives.
0.8 "Storage" (released 11.3.2010) 0.8 "Storage" (released 11.3.2010)
* Fix path error by using absolute pathname for archive when changing * Fix path error by using absolute pathname for archive when changing

2
patoolib/__init__.py
View File

@ -468,7 +468,7 @@ def _diff_archives (archive1, archive2):
try: try:
path1 = _handle_archive(archive1, 'extract', outdir=tmpdir1) path1 = _handle_archive(archive1, 'extract', outdir=tmpdir1)
path2 = _handle_archive(archive2, 'extract', outdir=tmpdir2) path2 = _handle_archive(archive2, 'extract', outdir=tmpdir2)
return util.run([diff, "-BurN", path1, path2]) return util.run([diff, "-urN", path1, path2])
finally: finally:
shutil.rmtree(tmpdir1, onerror=util.log_error) shutil.rmtree(tmpdir1, onerror=util.log_error)
shutil.rmtree(tmpdir2, onerror=util.log_error) shutil.rmtree(tmpdir2, onerror=util.log_error)