diff options
| author | Holger Freyther <zecke@selfish.org> | 2007-12-26 20:54:06 +0000 |
|---|---|---|
| committer | Holger Freyther <zecke@selfish.org> | 2007-12-26 20:54:06 +0000 |
| commit | 4bed3f7b179bc20bcc785080af164d75c1f44144 (patch) | |
| tree | 89c86e38be82dd3c83cd401be4b68a80db5ebec0 /classes | |
| parent | d55660f0952af6c701c3a34949252b95bb6ec9c9 (diff) | |
classes/insane.bbclass: Handle non-elf files gracefully (again)
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/insane.bbclass | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/classes/insane.bbclass b/classes/insane.bbclass index 36961ea811..ca2b33ab8b 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -99,11 +99,10 @@ def package_qa_get_elf(path, bits32): ELFDATA2LSB = 1 ELFDATA2MSB = 2 - def my_assert(expectation, result): + def my_assert(self, expectation, result): if not expectation == result: - #print "'%x','%x'" % (ord(expectation), ord(result)) + #print "'%x','%x' %s" % (ord(expectation), ord(result), self.name) raise Exception("This does not work as expected") - my_assert = staticmethod(my_assert) def __init__(self, name): self.name = name @@ -112,16 +111,16 @@ def package_qa_get_elf(path, bits32): self.file = file(self.name, "r") self.data = self.file.read(ELFFile.EI_NIDENT+4) - ELFFile.my_assert(len(self.data), ELFFile.EI_NIDENT+4) - ELFFile.my_assert(self.data[0], chr(0x7f) ) - ELFFile.my_assert(self.data[1], 'E') - ELFFile.my_assert(self.data[2], 'L') - ELFFile.my_assert(self.data[3], 'F') + self.my_assert(len(self.data), ELFFile.EI_NIDENT+4) + self.my_assert(self.data[0], chr(0x7f) ) + self.my_assert(self.data[1], 'E') + self.my_assert(self.data[2], 'L') + self.my_assert(self.data[3], 'F') if bits32 : - ELFFile.my_assert(self.data[ELFFile.EI_CLASS], chr(ELFFile.ELFCLASS32)) + self.my_assert(self.data[ELFFile.EI_CLASS], chr(ELFFile.ELFCLASS32)) else: - ELFFile.my_assert(self.data[ELFFile.EI_CLASS], chr(ELFFile.ELFCLASS64)) - ELFFile.my_assert(self.data[ELFFile.EI_VERSION], chr(ELFFile.EV_CURRENT) ) + self.my_assert(self.data[ELFFile.EI_CLASS], chr(ELFFile.ELFCLASS64)) + self.my_assert(self.data[ELFFile.EI_VERSION], chr(ELFFile.EV_CURRENT) ) self.sex = self.data[ELFFile.EI_DATA] if self.sex == chr(ELFFile.ELFDATANONE): @@ -285,7 +284,10 @@ def package_qa_check_arch(path,name,d): (machine, osabi, abiversion, littleendian, bits32) \ = package_qa_get_machine_dict()[target_os][target_arch] elf = package_qa_get_elf(path, bits32) - elf.open() + try: + elf.open() + except: + return True # Check the architecture and endiannes of the binary if not machine == elf.machine(): |