[Git][reproducible-builds/diffoscope][master] Fix regression where we stopped using the -dbgsym packages when comparing...

[Chris Lamb]

Chris Lamb pushed to branch master at Reproducible Builds / diffoscope


Commits:
2136e60c by Chris Lamb at 2019-02-08T16:34:08Z
Fix regression where we stopped using the -dbgsym packages when comparing .buildinfo or .changes files. (Closes: reproducible-builds/diffoscope:#46)

- - - - -


1 changed file:

- diffoscope/comparators/elf.py


Changes:

=====================================
diffoscope/comparators/elf.py
=====================================
@@ -469,7 +469,7 @@ class ElfContainer(Container):
             )
             raise OutputParsingError(command, self)
 
-        if not has_debug_symbols and Config().use_dbgsym:
+        if not has_debug_symbols:
             self._install_debug_symbols()
 
     @tool_required('objcopy')
@@ -485,6 +485,15 @@ class ElfContainer(Container):
         if not isinstance(deb, DebFile) or not deb.container:
             return
 
+        # If the .deb in question is the top-level of the source we have passed
+        # a .deb directly to diffoscope (versus finding one specified in a
+        # .changes or .buildinfo file). In this case, don't automatically
+        # search for a -dbgsym file unless the user specified
+        # `Config().use_dbgsym`.
+        if not hasattr(deb.container.source, 'container') and \
+                not Config().use_dbgsym:
+            return
+
         # Retrieve the Build ID for the ELF file we are examining
         build_id = get_build_id(self.source.path)
         debuglink = get_debug_link(self.source.path)



View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/commit/2136e60cbf5c5d24b0f5e20418618bea912d34b8

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/commit/2136e60cbf5c5d24b0f5e20418618bea912d34b8
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/20190208/2adf8e46/attachment.html>