Gbp-Dch: ignore

Simplify tests_quines.py::test_{differences,differences_deb} to simply use assert_diff and not mangle the test fixture.

Gbp-Dch: ignore

UKIFile.recognizes relies on objdump, but it doesn't account for
the scenario where binutils is not available. This  results in a
crash with an unhandled error.

Therefore, handle this scenario more gracefully.

Gbp-Dch: ignore

Gbp-Dch: ignore

Jelle van der Waa authored Oct 01, 2024 and Chris Lamb committed Oct 14, 2024

Diffoscope supported diffing UKI's with objdump in Pe32PlusFile, but
this doesn't work too well with 200M+ UKI's. It takes a long time to
generate the diff, ukify from systemd-ukify gives a user-friendly dump
of the sections with hashes so one can easily see what part of the UKI
is not reproducible.

Signed-off-by: Chris Lamb <lamby@debian.org>

Gbp-Dch: ignore

Gbp-Dch: ignore

Drop removal of calculated basename from readelf output. (Closes: #394)

I don't think readelf includes the name anymore, at least how diffoscope calls it:

         if (optind < (argc - 1))
           /* When displaying information for more than one file,
              prefix the information with the file name.  */
           show_name = true;
           ...

Gbp-Dch: ignore

Correctly invert "X% similar" value and do not emit "100% similar". (Closes: #391)

Add a helpful contextual message to the output if comparing Debian .orig tarballs within .dsc files without the ability to "fuzzy-match" away the leading directory. (Closes: #386)

Temporarily remove procyon-decompiler from Build-Depends as it was removed from testing (#1057532). (Closes: #1082636)

Gbp-Dch: ignore

Noticed the crash today when tried to compare glibc directories:

    $ diffoscope /nix/store/shybiq9nx8j3sp3ax2gb6c4lni1djabl-glibc-2.39-52/ /nix/store/bsin40d5wph9yr28rrd0j0zq6qm6982s-glibc-2.39-52/
      File "...-diffoscope-276/lib/python3.12/site-packages/diffoscope/comparators/directory.py", line 280, in compare
        differences.extend(my_container.compare(other_container))
      File "...-diffoscope-276/lib/python3.12/site-packages/diffoscope/comparators/utils/container.py", line 164, in comparisons
        for my_name, other_name, score in self.perform_fuzzy_matching(
      File "...-diffoscope-276/lib/python3.12/site-packages/diffoscope/comparators/utils/fuzzy.py", line 45, in perform_fuzzy_matching
        if file1.is_directory() or not file1.fuzzy_hash:
                                       ^^^^^^^^^^^^^^^^
      File "...-diffoscope-276/lib/python3.12/site-packages/diffoscope/comparators/utils/file.py", line 380, in fuzzy_hash
        self._fuzzy_hash = calc()
                           ^^^^^^
      File "...-diffoscope-276/lib/python3.12/site-packages/diffoscope/comparators/utils/file.py", line 368, in calc
        with open(self.path, "rb") as f:
             ^^^^^^^^^^^^^^^^^^^^^
    IsADirectoryError: [Errno 21] Is a directory: '/nix/store/shybiq9nx8j3sp3ax2gb6c4lni1djabl-glibc-2.39-52/lib64'

It looks like `diffoscope` was confused by a symlink to a directory:

    $ ls -l /nix/store/shybiq9nx8j3sp3ax2gb6c4lni1djabl-glibc-2.39-52/lib64
    lrwxrwxrwx 907 root root 3 Jan  1  1970 /nix/store/shybiq9nx8j3sp3ax2gb6c4lni1djabl-glibc-2.39-52/lib64 -> lib

THe change ignores `IsADirectoryError` for this case.

Gbp-Dch: ignore

Also catch RuntimeError when importing PyPDF so that PyPDF or, crucially, its transitive dependencies do not cause diffoscope to traceback at runtime and build time. (Closes: Debian:#1078944, #389)

The root or even primary cause of this bug is not in diffoscope itself; rather,
the cause is to be found between src:python3-cryptography and src:openssl — see
bugs #1078747 and #965041 for more details.

However, diffoscope should (and easily can…) be mindful that importing external
libraries could result in exceptions other than ImportError when we have reason
to believe that they might do so.

We already do so in fsimage.py for a complicated library (guestfs), so I think
it's not at all unreasonable to catch it here, too.

Alas I can't seem to reproduce this on my local machine or in a clean sid
chroot, so I am uploading the following patch after simply having a hard stare
at the code… albeit on a warm Sunday afternoon.

Gbp-Dch: ignore