Commit 16d519a9 authored by Chris Lamb's avatar Chris Lamb 👀
Browse files

Revert "Don't assume all files called ".a" are ELF binaries. This prevents an... 

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 a1b57f81 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%]
parent a1b57f81

diffoscope/comparators/elf.py

+1 −0
Original line number Diff line number Diff line
@@ -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(