mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

lib/qa.py: raise ValueError if file isn't an ELF

Browse Source 
Instead of raising a generic Exception that can't be handled specifically, raise
a ValueError.  Also update the callers so any unexpected exceptions are not
ignored.

Also, rename isBigEngian() to isBigEndian().

(From OE-Core rev: c136652f9c0b35aafa393e63567daf029ae03929)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2016-02-15 17:48:25 +00:00
committed by Richard Purdie
parent 334e1b5e0e
commit 7a700f59d9
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
meta/classes/insane.bbclass
View File

@@ -792,7 +792,9 @@ def package_qa_walk(warnfuncs, errorfuncs, skip, package, d):
elf = oe.qa.ELFFile(path)
try:
elf.open()
except:
except (IOError, ValueError):
# IOError can happen if the packaging control files disappear,
# ValueError means the file isn't an ELF.
elf = None
for func in warnfuncs:
func(path, package, d, elf, warnings)

2
meta/classes/uninative.bbclass
View File

@@ -80,7 +80,7 @@ python uninative_changeinterp () {
elf = oe.qa.ELFFile(f)
try:
elf.open()
except:
except ValueError:
continue
#bb.warn("patchelf-uninative --set-interpreter %s %s" % (d.getVar("UNINATIVE_LOADER", True), f))

14
meta/lib/oe/qa.py
View File

@@ -23,7 +23,7 @@ class ELFFile:
def my_assert(self, expectation, result):
if not expectation == result:
#print "'%x','%x' %s" % (ord(expectation), ord(result), self.name)
raise Exception("This does not work as expected")
raise ValueError("%s is not an ELF" % self.name)
def __init__(self, name, bits = 0):
self.name = name
@@ -32,7 +32,7 @@ class ELFFile:
def open(self):
if not os.path.isfile(self.name):
raise Exception("File is not a normal file")
raise ValueError("%s is not a normal file" % self.name)
self.file = file(self.name, "r")
self.data = self.file.read(ELFFile.EI_NIDENT+4)
@@ -49,24 +49,24 @@ class ELFFile:
self.bits = 64
else:
# Not 32-bit or 64.. lets assert
raise Exception("ELF but not 32 or 64 bit.")
raise ValueError("ELF but not 32 or 64 bit.")
elif self.bits == 32:
self.my_assert(self.data[ELFFile.EI_CLASS], chr(ELFFile.ELFCLASS32))
elif self.bits == 64:
self.my_assert(self.data[ELFFile.EI_CLASS], chr(ELFFile.ELFCLASS64))
else:
raise Exception("Must specify unknown, 32 or 64 bit size.")
raise ValueError("Must specify unknown, 32 or 64 bit size.")
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):
raise Exception("self.sex == ELFDATANONE")
raise ValueError("self.sex == ELFDATANONE")
elif self.sex == chr(ELFFile.ELFDATA2LSB):
self.sex = "<"
elif self.sex == chr(ELFFile.ELFDATA2MSB):
self.sex = ">"
else:
raise Exception("Unknown self.sex")
raise ValueError("Unknown self.sex")
def osAbi(self):
return ord(self.data[ELFFile.EI_OSABI])
@@ -80,7 +80,7 @@ class ELFFile:
def isLittleEndian(self):
return self.sex == "<"
def isBigEngian(self):
def isBigEndian(self):
return self.sex == ">"
def machine(self):