[Git][reproducible-builds/diffoscope][master] 2 commits: Don't include debug output when calling dumppdf(1).

[Chris Lamb (@lamby)]

Chris Lamb pushed to branch master at Reproducible Builds / diffoscope


Commits:
9382ba74 by Chris Lamb at 2024-08-05T14:12:26+01:00
Don't include debug output when calling dumppdf(1).

- - - - -
956114dd by Chris Lamb at 2024-08-05T14:12:26+01:00
Append output from dumppdf(1) in more cases. (Closes: reproducible-builds/diffoscope#387)

- - - - -


1 changed file:

- diffoscope/comparators/pdf.py


Changes:

=====================================
diffoscope/comparators/pdf.py
=====================================
@@ -86,7 +86,7 @@ class Pdftotext(Command):
 class Dumppdf(Command):
     @tool_required("dumppdf")
     def cmdline(self):
-        return ["dumppdf", "-adt", self.path]
+        return ["dumppdf", "-at", self.path]
 
 
 class PdfFile(File):
@@ -96,16 +96,18 @@ class PdfFile(File):
     def compare_details(self, other, source=None):
         xs = []
 
-        xs.extend(self.gen_metadata_differences(other))
         xs.append(Difference.from_operation(Pdftotext, self.path, other.path))
 
-        # Don't include verbose dumppdf output unless we won't see any
-        # differences without it.
+        # Include verbose dumppdf output unless we won't see any differences
+        # without it.
         if not any(xs):
             xs.append(
                 Difference.from_operation(Dumppdf, self.path, other.path)
             )
 
+        # Always preppend metadata differences
+        xs[:0] = self.gen_metadata_differences(other)
+
         return xs
 
     def gen_metadata_differences(self, other):



View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/compare/22bfca8874f987f50bad7303df55799e2b4382fc...956114dd053b7b9836d2293701fb8cfdbc6e6060

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/compare/22bfca8874f987f50bad7303df55799e2b4382fc...956114dd053b7b9836d2293701fb8cfdbc6e6060
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/20240805/f9057cba/attachment.htm>