[Git][reproducible-builds/diffoscope][master] 2 commits: Drop unused list_libarchive import.

[Chris Lamb]

Chris Lamb pushed to branch master at Reproducible Builds / diffoscope


Commits:
73671b9a by Chris Lamb at 2020-06-08T13:03:30+01:00
Drop unused list_libarchive import.

- - - - -
c2e1ab70 by Chris Lamb at 2020-06-08T13:03:30+01:00
Prevent a traceback when comparing a PDF document that does not contain metadata (ie. a PDF "/Info" stanza). (Closes: reproducible-builds/diffoscope#150)

- - - - -


2 changed files:

- diffoscope/comparators/elf.py
- diffoscope/comparators/pdf.py


Changes:

=====================================
diffoscope/comparators/elf.py
=====================================
@@ -34,7 +34,6 @@ from .deb import DebFile, get_build_id_map
 from .utils.file import File
 from .utils.command import Command
 from .utils.container import Container
-from .utils.libarchive import list_libarchive
 
 DEBUG_SECTION_GROUPS = (
     "rawline",


=====================================
diffoscope/comparators/pdf.py
=====================================
@@ -84,6 +84,9 @@ class PdfFile(File):
         except PyPDF2.utils.PdfReadError as e:
             return "(Could not extract metadata: {})".format(e)
 
+        if document_info is None:
+            return ""
+
         xs = []
         for k, v in sorted(document_info.items()):
             xs.append("{}: {!r}".format(k.lstrip("/"), v))



View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/compare/0abfbdfcbaf98f87f1eef9487a688425999c6259...c2e1ab704f7ab86b582d3979392e790a4b8797d2

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/compare/0abfbdfcbaf98f87f1eef9487a688425999c6259...c2e1ab704f7ab86b582d3979392e790a4b8797d2
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/20200608/d791903a/attachment.htm>