From 5e21670b8e58ae2ced2b53374e89df153081d6d1 Mon Sep 17 00:00:00 2001 From: Bastian Kleineidam Date: Thu, 18 Mar 2010 19:25:42 +0100 Subject: [PATCH] Do not use diff -B. --- doc/changelog.txt | 4 ++++ patoolib/__init__.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/changelog.txt b/doc/changelog.txt index 84e5456..212afc9 100644 --- a/doc/changelog.txt +++ b/doc/changelog.txt @@ -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) * Fix path error by using absolute pathname for archive when changing diff --git a/patoolib/__init__.py b/patoolib/__init__.py index 25a96c8..e169786 100644 --- a/patoolib/__init__.py +++ b/patoolib/__init__.py @@ -468,7 +468,7 @@ def _diff_archives (archive1, archive2): try: path1 = _handle_archive(archive1, 'extract', outdir=tmpdir1) path2 = _handle_archive(archive2, 'extract', outdir=tmpdir2) - return util.run([diff, "-BurN", path1, path2]) + return util.run([diff, "-urN", path1, path2]) finally: shutil.rmtree(tmpdir1, onerror=util.log_error) shutil.rmtree(tmpdir2, onerror=util.log_error)