[Git][reproducible-builds/diffoscope][master] Don't require zipnote(1) to determine differences in a zipfile; we can use libarchive.

[Chris Lamb]

Chris Lamb pushed to branch master at Reproducible Builds / diffoscope


Commits:
a8c9d69f by Chris Lamb at 2020-07-13T12:41:56+01:00
Don't require zipnote(1) to determine differences in a zipfile; we can use libarchive.

- - - - -


1 changed file:

- diffoscope/comparators/zip.py


Changes:

=====================================
diffoscope/comparators/zip.py
=====================================
@@ -201,9 +201,14 @@ class ZipFile(File):
         differences = []
         if Config().exclude_directory_metadata != "recursive":
             differences.extend(zipinfo_differences(self, other))
-        differences.append(
-            Difference.from_command(Zipnote, self.path, other.path)
-        )
+
+        try:
+            differences.append(
+                Difference.from_command(Zipnote, self.path, other.path)
+            )
+        except RequiredToolNotFound:  # noqa
+            pass
+
         return differences
 
 



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

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/a8c9d69f86258f3d6274f6b549b6b7a5e19e4dcb
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/20200713/5600ce29/attachment.htm>