diffoscope 322__tar.gz → 324__tar.gz

{diffoscope-322/diffoscope.egg-info → diffoscope-324}/PKG-INFO

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

{diffoscope-322 → diffoscope-324}/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 = "322"
+VERSION = "324"

{diffoscope-322 → diffoscope-324}/diffoscope/comparators/gzip.py

@@ -48,11 +48,19 @@ class GzipContainer(Archive):
             # Use the short options (-d and -c) instead of the long options
             # (--decompress and --stdout) to support the gzip implementation
             # present in busybox, which doesn't support the long options.
-            subprocess.check_call(
+            returncode = subprocess.call(
                 ["gzip", "-d", "-c", self.source.path],
                 stdout=fp,
                 stderr=None,
             )
+        # gzip exits with 2 (a warning) when decompression succeeds but there
+        # is trailing garbage after the stream, eg. metadata appended to
+        # OpenWrt firmware images. The payload is still fully decompressed, so
+        # only treat a fatal error (exit code 1) as a failure.
+        if returncode not in (0, 2):
+            raise subprocess.CalledProcessError(
+                returncode, ["gzip", "-d", "-c", self.source.path]
+            )
         return dest_path
 
 

{diffoscope-322 → diffoscope-324/diffoscope.egg-info}/PKG-INFO

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

{diffoscope-322 → diffoscope-324}/tests/comparators/test_gzip.py

@@ -17,6 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with diffoscope.  If not, see <https://www.gnu.org/licenses/>.
 
+import gzip
 import shutil
 import pytest
 
@@ -90,6 +91,28 @@ def test_content_diff(differences):
     assert differences[1].unified_diff == expected_diff
 
 
+def test_trailing_garbage(tmpdir):
+    # OpenWrt firmware images append metadata after the gzip stream, which
+    # makes gzip(1) exit with a warning (code 2) even though the payload
+    # decompressed fine. Ensure we still compare the content.
+    def make(name, content):
+        path = str(tmpdir.join(name))
+        with gzip.open(path, "wb") as fp:
+            fp.write(content)
+        with open(path, "ab") as fp:
+            fp.write(b"OpenWrt appended metadata blob")
+        return specialize(FilesystemFile(path))
+
+    file1 = make("garbage1.gz", b"hello\n")
+    file2 = make("garbage2.gz", b"world\n")
+
+    assert file1.compare(file1) is None
+    difference = file1.compare(file2)
+    assert difference is not None
+    # The decompressed content must have been extracted and compared.
+    assert difference.details[-1].unified_diff
+
+
 def test_compare_non_existing(monkeypatch, gzip1):
     monkeypatch.setattr(Config(), "new_file", True)
     difference = gzip1.compare(MissingFile("/nonexisting", gzip1))

{diffoscope-322 → diffoscope-324}/tests/comparators/test_ocaml.py

@@ -23,7 +23,7 @@ from diffoscope.comparators.ocaml import OcamlInterfaceFile
 from diffoscope.comparators.binary import FilesystemFile
 from diffoscope.comparators.utils.specialize import specialize
 
-from ..utils.data import assert_diff_startswith
+from ..utils.data import assert_diff_endswith
 from ..utils.tools import skip_unless_tool_is_at_least
 from ..utils.nonexisting import assert_non_existing
 
@@ -74,7 +74,10 @@ def test_no_differences(cmi1):
 
 @skip_unless_tool_is_at_least("ocamlobjinfo", ocaml_version, "5.4.1")
 def test_diff(differences):
-    assert_diff_startswith(differences[0], "ocaml_expected_diff")
+    # Debian adds an extra "Flags:" line in the output, so we only compare the
+    # bottom parts of the diff to ensure cross-distro compatibility.
+    # (diffoscope#430)
+    assert_diff_endswith(differences[0], "ocaml_expected_diff")
 
 
 @skip_unless_tool_is_at_least("ocamlobjinfo", ocaml_version, "4.11")

{diffoscope-322 → diffoscope-324}/tests/comparators/test_zip.py

@@ -81,7 +81,7 @@ def differences2(zip1, zip3):
 
 
 @skip_unless_tools_exist("zipinfo", "zipdetails")
-@skip_unless_tool_is_at_least("zipdetails", zipdetails_version, "4.004")
+@skip_unless_tool_is_at_least("zipdetails", zipdetails_version, "4.006")
 @skip_unless_tool_is_at_least("perl", io_compress_zip_version, "2.212")
 def test_metadata(differences):
     assert_diff(differences[0], "zip_zipinfo_expected_diff")
@@ -96,6 +96,7 @@ def test_compressed_files(differences):
 
 
 @skip_unless_tools_exist("zipinfo", "bsdtar", "zipdetails")
+@skip_unless_tool_is_at_least("zipdetails", zipdetails_version, "4.006")
 @skip_unless_tool_is_at_least("perl", io_compress_zip_version, "2.212")
 def test_extra_fields(differences2):
     assert_diff(differences2[0], "zip_bsdtar_expected_diff")

{diffoscope-322 → diffoscope-324}/tests/data/ocaml_expected_diff

@@ -1,7 +1,3 @@
-@@ -1,6 +1,6 @@
--Unit name: Test1
-+Unit name: Test2
- Flags: [ Alerts _ ]
  Interfaces imported:
 -	351c2dc2fb4a56dac258b47c26262db6	Test1
 +	ac02205dc900024a67ede9f394c59d72	Test2

{diffoscope-322 → diffoscope-324}/tests/data/zip2_zipdetails_expected_diff

@@ -5,7 +5,7 @@
  #
  0064 Extra ID #1           5455 (21589) 'Extended Timestamp [UT]'
  0066   Length              0009 (9)
- 0068   Flags               03 (3) 'Modification Access'
+ 0068   Flags               03 (3) 'Modification & Access'
 -0069   Modification Time   558AB455 (1435153493) 'Wed Jun 24 13:44:53 2015'
 -006D   Access Time         558AB45F (1435153503) 'Wed Jun 24 13:45:03 2015'
 +0069   Modification Time   41414141 (1094795585) 'Fri Sep 10 05:53:05 2004'

{diffoscope-322 → diffoscope-324}/tests/data/zip_zipdetails_expected_diff

@@ -23,7 +23,7 @@
  #
  0064 Extra ID #1           5455 (21589) 'Extended Timestamp [UT]'
  0066   Length              0009 (9)
- 0068   Flags               03 (3) 'Modification Access'
+ 0068   Flags               03 (3) 'Modification & Access'
 -0069   Modification Time   558AB455 (1435153493) 'Wed Jun 24 13:44:53 2015'
 +0069   Modification Time   558AB474 (1435153524) 'Wed Jun 24 13:45:24 2015'
  006D   Access Time         558AB45F (1435153503) 'Wed Jun 24 13:45:03 2015'
@@ -85,7 +85,7 @@
  #
 -01BF Extra ID #1           5455 (21589) 'Extended Timestamp [UT]'
 -01C1   Length              0005 (5)
--01C3   Flags               03 (3) 'Modification Access'
+-01C3   Flags               03 (3) 'Modification & Access'
 -01C4   Modification Time   558AB455 (1435153493) 'Wed Jun 24 13:44:53 2015'
 -01C8 Extra ID #2           7875 (30837) 'Unix Extra type 3 [ux]'
 -01CA   Length              000B (11)
@@ -96,7 +96,7 @@
 -01D3   GID                 000003E8 (1000)
 +024E Extra ID #1           5455 (21589) 'Extended Timestamp [UT]'
 +0250   Length              0005 (5)
-+0252   Flags               03 (3) 'Modification Access'
++0252   Flags               03 (3) 'Modification & Access'
 +0253   Modification Time   558AB455 (1435153493) 'Wed Jun 24 13:44:53 2015'
 +0257 Extra ID #2           7875 (30837) 'Unix Extra type 3 [ux]'
 +0259   Length              000B (11)
@@ -163,7 +163,7 @@
  #
 -020D Extra ID #1           5455 (21589) 'Extended Timestamp [UT]'
 -020F   Length              0005 (5)
--0211   Flags               03 (3) 'Modification Access'
+-0211   Flags               03 (3) 'Modification & Access'
 -0212   Modification Time   558AB455 (1435153493) 'Wed Jun 24 13:44:53 2015'
 -0216 Extra ID #2           7875 (30837) 'Unix Extra type 3 [ux]'
 -0218   Length              000B (11)
@@ -174,7 +174,7 @@
 -0221   GID                 000003E8 (1000)
 +029C Extra ID #1           5455 (21589) 'Extended Timestamp [UT]'
 +029E   Length              0005 (5)
-+02A0   Flags               03 (3) 'Modification Access'
++02A0   Flags               03 (3) 'Modification & Access'
 +02A1   Modification Time   558AB474 (1435153524) 'Wed Jun 24 13:45:24 2015'
 +02A5 Extra ID #2           7875 (30837) 'Unix Extra type 3 [ux]'
 +02A7   Length              000B (11)

{diffoscope-322 → diffoscope-324}/tests/utils/data.py

@@ -3,7 +3,7 @@
 #
 # Copyright © 2015      Jérémy Bobbio <lunar@debian.org>
 # Copyright © 2016-2017 Mattia Rizzolo <mattia@debian.org>
-# Copyright © 2019-2023, 2025 Chris Lamb <lamby@debian.org>
+# Copyright © 2019-2023, 2025-2026 Chris Lamb <lamby@debian.org>
 #
 # diffoscope is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -70,6 +70,12 @@ def assert_diff_startswith(difference, filename):
     assert haystack.startswith(needle)
 
 
+def assert_diff_endswith(difference, filename):
+    haystack = difference.unified_diff
+    needle = get_data(filename)
+    assert haystack.endswith(needle)
+
+
 # https://code.activestate.com/recipes/576620-changedirectory-context-manager/#c3
 @contextlib.contextmanager
 def cwd_data():