[Reproducible-commits] [debbindiff] 01/08: Fix source path when handling gzip, bzip2 and xz

[Jérémy Bobbio]

This is an automated email from the git hooks/post-receive script.

lunar pushed a commit to branch master
in repository debbindiff.

commit 505e32bb361caaa65d210a91892d26d0ce20c923
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Fri Mar 20 11:35:34 2015 +0100

    Fix source path when handling gzip, bzip2 and xz
    
    Closes: #779474
---
 debbindiff/comparators/bzip2.py | 2 +-
 debbindiff/comparators/gzip.py  | 2 +-
 debbindiff/comparators/xz.py    | 2 +-
 debbindiff/difference.py        | 7 +++++--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/debbindiff/comparators/bzip2.py b/debbindiff/comparators/bzip2.py
index c86cb01..ab2f541 100644
--- a/debbindiff/comparators/bzip2.py
+++ b/debbindiff/comparators/bzip2.py
@@ -46,4 +46,4 @@ def compare_bzip2_files(path1, path2, source=None):
         with decompress_bzip2(path2) as new_path2:
             return debbindiff.comparators.compare_files(
                 new_path1, new_path2,
-                source=get_source(new_path1, new_path2))
+                source=[os.path.basename(new_path1), os.path.basename(new_path2)])
diff --git a/debbindiff/comparators/gzip.py b/debbindiff/comparators/gzip.py
index e59ebf4..6eb990c 100644
--- a/debbindiff/comparators/gzip.py
+++ b/debbindiff/comparators/gzip.py
@@ -61,5 +61,5 @@ def compare_gzip_files(path1, path2, source=None):
         with decompress_gzip(path2) as new_path2:
             differences.extend(debbindiff.comparators.compare_files(
                 new_path1, new_path2,
-                source=get_source(new_path1, new_path2)))
+                source=[os.path.basename(new_path1), os.path.basename(new_path2)]))
     return differences
diff --git a/debbindiff/comparators/xz.py b/debbindiff/comparators/xz.py
index 09bc10a..e24e05d 100644
--- a/debbindiff/comparators/xz.py
+++ b/debbindiff/comparators/xz.py
@@ -46,4 +46,4 @@ def compare_xz_files(path1, path2, source=None):
         with decompress_xz(path2) as new_path2:
             return debbindiff.comparators.compare_files(
                 new_path1, new_path2,
-                source=get_source(new_path1, new_path2))
+                source=[os.path.basename(new_path1), os.path.basename(new_path2)])
diff --git a/debbindiff/difference.py b/debbindiff/difference.py
index 6293a7d..313ba1a 100644
--- a/debbindiff/difference.py
+++ b/debbindiff/difference.py
@@ -30,8 +30,11 @@ class Difference(object):
         # allow to override declared file paths, useful when comparing
         # tempfiles
         if source:
-            self._source1 = source
-            self._source2 = source
+            if type(source) is list:
+                self._source1, self._source2 = source
+            else:
+                self._source1 = source
+                self._source2 = source
         else:
             self._source1 = path1
             self._source2 = path2

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/debbindiff.git