From c136652f9c0b35aafa393e63567daf029ae03929 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 15 Feb 2016 17:48:25 +0000 Subject: lib/qa.py: raise ValueError if file isn't an ELF 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(). Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/lib/oe/qa.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'meta/lib/oe') diff --git a/meta/lib/oe/qa.py b/meta/lib/oe/qa.py index 21fb9977ce..2ad6c63bdc 100644 --- a/meta/lib/oe/qa.py +++ b/meta/lib/oe/qa.py @@ -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): -- cgit 1.2.3-korg