[Reproducible-commits] [debbindiff] 08/10: Add specific comparison function for md5sums files

[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 77f2ec9d440cdd7149988d9ed6ab5a1cd2a2a2c4
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Tue Sep 30 00:26:54 2014 +0200

    Add specific comparison function for md5sums files
    
    We are going to examine every files in the package, so there's no
    added value in displaying a diff of the md5sums files. They are
    different, that's enough information.
---
 debbindiff/comparators/__init__.py | 19 ++++++++++---------
 debbindiff/comparators/deb.py      |  9 +++++++--
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/debbindiff/comparators/__init__.py b/debbindiff/comparators/__init__.py
index f7c9ddc..dd14a61 100644
--- a/debbindiff/comparators/__init__.py
+++ b/debbindiff/comparators/__init__.py
@@ -25,7 +25,7 @@ from debbindiff.difference import Difference, get_source
 from debbindiff.comparators.binary import compare_binary_files
 from debbindiff.comparators.bzip2 import compare_bzip2_files
 from debbindiff.comparators.changes import compare_changes_files
-from debbindiff.comparators.deb import compare_deb_files
+from debbindiff.comparators.deb import compare_deb_files, compare_md5sums_files
 from debbindiff.comparators.elf import compare_elf_files
 from debbindiff.comparators.gzip import compare_gzip_files
 from debbindiff.comparators.haskell import compare_hi_files
@@ -55,14 +55,15 @@ def compare_unknown(path1, path2, source=None):
     return compare_binary_files(path1, path2, source)
 
 COMPARATORS = [
-        (None,                                  r'\.changes$', compare_changes_files),
-        (None,                                  r'\.(p_)?hi$', compare_hi_files),
-        (r'^application/x-xz(;|$)',             r'\.xz$',      compare_xz_files),
-        (r'^application/x-tar(;|$)',            r'\.tar$',     compare_tar_files),
-        (r'^application/x-debian-package(;|$)', r'\.deb$',     compare_deb_files),
-        (r'^application/x-gzip(;|$)',           r'\.gz$',      compare_gzip_files),
-        (r'^application/x-bzip2(;|$)',          r'\.bzip2$',   compare_bzip2_files),
-        (r'^application/x-executable(;|$)',     None,          compare_elf_files),
+        (None,                                  r'\.changes$',    compare_changes_files),
+        (None,                                  r'\.(p_)?hi$',    compare_hi_files),
+        (None,                                  r'\/\./md5sums$', compare_md5sums_files),
+        (r'^application/x-xz(;|$)',             r'\.xz$',         compare_xz_files),
+        (r'^application/x-tar(;|$)',            r'\.tar$',        compare_tar_files),
+        (r'^application/x-debian-package(;|$)', r'\.deb$',        compare_deb_files),
+        (r'^application/x-gzip(;|$)',           r'\.gz$',         compare_gzip_files),
+        (r'^application/x-bzip2(;|$)',          r'\.bzip2$',      compare_bzip2_files),
+        (r'^application/x-executable(;|$)',     None,             compare_elf_files),
     ]
 
 def compare_files(path1, path2, source=None):
diff --git a/debbindiff/comparators/deb.py b/debbindiff/comparators/deb.py
index 11d30e4..043aa57 100644
--- a/debbindiff/comparators/deb.py
+++ b/debbindiff/comparators/deb.py
@@ -21,9 +21,9 @@ import os.path
 import subprocess
 from debian.arfile import ArFile
 from debbindiff import logger
-from debbindiff.difference import Difference
+from debbindiff.difference import Difference, get_source
 import debbindiff.comparators
-from debbindiff.comparators.utils import binary_fallback, make_temp_directory
+from debbindiff.comparators.utils import binary_fallback, make_temp_directory, are_same_binaries
 
 def get_ar_content(path):
     return subprocess.check_output(['ar', 'tv', path], shell=False)
@@ -59,3 +59,8 @@ def compare_deb_files(path1, path2, source=None):
     if content1 != content2:
         differences.append(Difference(content1.splitlines(1), content2.splitlines(1), path1, path2, source="metadata"))
     return differences
+
+def compare_md5sums_files(path1, path2, source=None):
+    if are_same_binaries(path1, path2):
+        return []
+    return [Difference(None, None, path1, path2, source=get_source(path1, path2), comment="Files in package differs")]

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