[Git][reproducible-builds/diffoscope][master] Revert "Don't assume all files called ".a" are ELF binaries. This prevents an…

[Chris Lamb]

Chris Lamb pushed to branch master at Reproducible Builds / diffoscope


Commits:
16d519a9 by Chris Lamb at 2018-11-09T17:02:39Z
Revert "Don't assume all files called ".a" are ELF binaries. This prevents an "Unrecognized archive format" traceback when processing (for example) lie 2.2.2+dfsg-3."

This reverts commit a1b57f8158ca0af72ed00e0a76ab6f50cc32f737 as it causes
regressions in the rlib tests:

tests/comparators/test_rlib.py::test_identification FAILED               [ 81%]
tests/comparators/test_rlib.py::test_no_differences PASSED               [ 82%]
tests/comparators/test_rlib.py::test_num_items FAILED                    [ 82%]
tests/comparators/test_rlib.py::test_item0_armap FAILED                  [ 82%]
tests/comparators/test_rlib.py::test_item1_elf FAILED                    [ 82%]
tests/comparators/test_rlib.py::test_item2_rust_metadata_bin FAILED      [ 83%]
tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode FAILED   [ 83%]
tests/comparators/test_rlib.py::test_compare_non_existing FAILED         [ 83%]

- - - - -


1 changed file:

- diffoscope/comparators/elf.py


Changes:

=====================================
diffoscope/comparators/elf.py
=====================================
@@ -579,6 +579,7 @@ class StaticLibFile(File):
     DESCRIPTION = "statically-linked binaries"
     CONTAINER_CLASS = ElfContainer
     FILE_TYPE_RE = re.compile(r'\bar archive\b')
+    FILE_EXTENSION_SUFFIX = '.a'
 
     def compare_details(self, other, source=None):
         differences = [Difference.from_text_readers(



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

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/commit/16d519a9a1f77f45ea8ab5464f1b960db0d16983
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/20181109/e2b3032f/attachment.html>