diffoscope 263__tar.gz → 264__tar.gz

{diffoscope-263 → diffoscope-264}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: diffoscope
-Version: 263
+Version: 264
 Summary: in-depth comparison of files, archives, and directories
 Home-page: https://diffoscope.org/
 Author: Diffoscope developers

{diffoscope-263 → diffoscope-264}/debian/changelog

@@ -1,8 +1,23 @@
-diffoscope (264) UNRELEASED; urgency=medium
+diffoscope (265) UNRELEASED; urgency=medium
 
   * WIP (generated upon release).
 
- -- Chris Lamb <lamby@debian.org>  Fri, 05 Apr 2024 12:24:24 +0100
+ -- Chris Lamb <lamby@debian.org>  Fri, 12 Apr 2024 09:40:03 +0100
+
+diffoscope (264) unstable; urgency=medium
+
+  [ Chris Lamb ]
+  * Don't crash on invalid zipfiles, even if we encounter 'badness'
+    through through the file. (Re: #1068705)
+
+  [ FC (Fay) Stegerman ]
+  * Add note when there are duplicate entries in ZIP files.
+    (Closes: reproducible-builds/diffoscope!140)
+
+  [ Vagrant Cascadian ]
+  * Add an external tool reference for GNU Guix for zipdetails.
+
+ -- Chris Lamb <lamby@debian.org>  Fri, 12 Apr 2024 09:38:55 +0100
 
 diffoscope (263) unstable; urgency=medium
 

{diffoscope-263 → diffoscope-264}/diffoscope/__init__.py

@@ -17,4 +17,4 @@
 # You should have received a copy of the GNU General Public License
 # along with diffoscope.  If not, see <https://www.gnu.org/licenses/>.
 
-VERSION = "263"
+VERSION = "264"

{diffoscope-263 → diffoscope-264}/diffoscope/comparators/zip.py

@@ -182,7 +182,15 @@ class ZipDirectory(Directory, ArchiveMember):
 
 class ZipContainer(Archive):
     def open_archive(self):
-        return zipfile.ZipFile(self.source.path, "r")
+        zf = zipfile.ZipFile(self.source.path, "r")
+        self.name_to_info = {}
+        self.duplicate_entries = 0
+        for info in zf.infolist():
+            if info.filename not in self.name_to_info:
+                self.name_to_info[info.filename] = info
+            else:
+                self.duplicate_entries += 1
+        return zf
 
     def close_archive(self):
         self.archive.close()
@@ -199,11 +207,14 @@ class ZipContainer(Archive):
         ).encode(sys.getfilesystemencoding(), errors="replace")
 
         try:
-            with self.archive.open(member_name) as source, open(
+            info = self.name_to_info[member_name]
+            with self.archive.open(info) as source, open(
                 targetpath, "wb"
             ) as target:
                 shutil.copyfileobj(source, target)
             return targetpath.decode(sys.getfilesystemencoding())
+        except zipfile.BadZipFile as e:
+            raise ContainerExtractionError(member_name, e)
         except RuntimeError as e:
             # Handle encrypted files see line 1292 of zipfile.py
             is_encrypted = self.archive.getinfo(member_name).flag_bits & 0x1
@@ -252,6 +263,21 @@ class ZipFile(ZipFileBase):
         r"^((?:iOS App )?Zip archive|Java archive|EPUB document|OpenDocument (Text|Spreadsheet|Presentation|Drawing|Formula|Template|Text Template)|Google Chrome extension)\b"
     )
 
+    def compare(self, other, source=None):
+        x = super().compare(other, source)
+
+        if x is None:
+            return None
+
+        self_dups = getattr(self.as_container, "duplicate_entries", 0)
+        other_dups = getattr(other.as_container, "duplicate_entries", 0)
+        if self_dups:
+            x.add_comment(f"{self.name!r} has {self_dups} duplicate entries")
+        if other_dups:
+            x.add_comment(f"{other.name!r} has {other_dups} duplicate entries")
+
+        return x
+
     def compare_details(self, other, source=None):
         differences = []
         if Config().exclude_directory_metadata != "recursive":

{diffoscope-263 → diffoscope-264}/diffoscope/external_tools.py

@@ -251,7 +251,7 @@ EXTERNAL_TOOLS = {
         "arch": "libxmlb",
         "guix": "libxmlb",
     },
-    "zipdetails": {"debian": "perl"},
+    "zipdetails": {"debian": "perl", "guix": "perl"},
     "zstd": {"debian": "zstd", "guix": "zstd"},
 }
 

{diffoscope-263 → diffoscope-264}/diffoscope.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: diffoscope
-Version: 263
+Version: 264
 Summary: in-depth comparison of files, archives, and directories
 Home-page: https://diffoscope.org/
 Author: Diffoscope developers