[Git][reproducible-builds/diffoscope][master] Don't show a binary comparison of .zip/.jar files if we have at least one...

[Chris Lamb (@lamby)]

Chris Lamb pushed to branch master at Reproducible Builds / diffoscope


Commits:
714d0b79 by Chris Lamb at 2022-05-17T08:26:40-07:00
Don't show a binary comparison of .zip/.jar files if we have at least one observed nested difference.

- - - - -


1 changed file:

- diffoscope/comparators/zip.py


Changes:

=====================================
diffoscope/comparators/zip.py
=====================================
@@ -196,11 +196,11 @@ class ZipFileBase(File):
         if x is None:
             return None
 
-        # If we have two or more differences, then we have observed differences
-        # within a nested file. If not, there is likely some difference in
-        # the metadata that zipinfo cannot discover, so we manually fallback to
-        # a binary diff.
-        if len(x.details) >= 2:
+        # If we have at least one differences, then we have observed
+        # differences within a nested file. If not, there is likely some
+        # difference in the metadata that zipinfo cannot discover, so we
+        # manually fallback to a binary diff.
+        if len(x.details) >= 1:
             return x
 
         x.add_comment(



View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/714d0b790b94e4c47494a889099ead2d322f5414

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/714d0b790b94e4c47494a889099ead2d322f5414
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.reproducible-builds.org/pipermail/rb-commits/attachments/20220517/82c85331/attachment.htm>