From 4c1fe0cbcb98b0a69ad5b3a04432055d773ee4ba Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 24 Feb 2016 13:31:40 +0000 Subject: lib/oe/qa: add explicit exception for 'file isn't an ELF' Signed-off-by: Ross Burton --- meta/classes/insane.bbclass | 3 +-- meta/classes/uninative.bbclass | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'meta/classes') diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 61936e1377..b9adea77c8 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -792,9 +792,8 @@ def package_qa_walk(warnfuncs, errorfuncs, skip, package, d): elf = oe.qa.ELFFile(path) try: elf.open() - except (IOError, ValueError): + except (IOError, oe.qa.NotELFFileError): # 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) diff --git a/meta/classes/uninative.bbclass b/meta/classes/uninative.bbclass index b14cec065e..7e225e6f15 100644 --- a/meta/classes/uninative.bbclass +++ b/meta/classes/uninative.bbclass @@ -80,7 +80,7 @@ python uninative_changeinterp () { elf = oe.qa.ELFFile(f) try: elf.open() - except ValueError: + except oe.qa.NotELFFileError: continue #bb.warn("patchelf-uninative --set-interpreter %s %s" % (d.getVar("UNINATIVE_LOADER", True), f)) -- cgit v1.2.3