diff options
author | Ross Burton <ross.burton@intel.com> | 2016-02-15 17:48:25 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-16 11:17:10 +0000 |
commit | 7a700f59d98ffe08714582532d3edb97abc2e33e (patch) | |
tree | 5a4bcc4afe511799e38ab386fd7c339c935f94f8 /meta/classes | |
parent | 334e1b5e0ee52f201379aee2d3b4d39943ee19e4 (diff) | |
download | poky-7a700f59d98ffe08714582532d3edb97abc2e33e.tar.gz |
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().
(From OE-Core rev: c136652f9c0b35aafa393e63567daf029ae03929)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/insane.bbclass | 4 | ||||
-rw-r--r-- | meta/classes/uninative.bbclass | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 530e711ec4..aef08fe28e 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass | |||
@@ -792,7 +792,9 @@ def package_qa_walk(warnfuncs, errorfuncs, skip, package, d): | |||
792 | elf = oe.qa.ELFFile(path) | 792 | elf = oe.qa.ELFFile(path) |
793 | try: | 793 | try: |
794 | elf.open() | 794 | elf.open() |
795 | except: | 795 | except (IOError, ValueError): |
796 | # IOError can happen if the packaging control files disappear, | ||
797 | # ValueError means the file isn't an ELF. | ||
796 | elf = None | 798 | elf = None |
797 | for func in warnfuncs: | 799 | for func in warnfuncs: |
798 | func(path, package, d, elf, warnings) | 800 | func(path, package, d, elf, warnings) |
diff --git a/meta/classes/uninative.bbclass b/meta/classes/uninative.bbclass index 0448cf6cdc..b14cec065e 100644 --- a/meta/classes/uninative.bbclass +++ b/meta/classes/uninative.bbclass | |||
@@ -80,7 +80,7 @@ python uninative_changeinterp () { | |||
80 | elf = oe.qa.ELFFile(f) | 80 | elf = oe.qa.ELFFile(f) |
81 | try: | 81 | try: |
82 | elf.open() | 82 | elf.open() |
83 | except: | 83 | except ValueError: |
84 | continue | 84 | continue |
85 | 85 | ||
86 | #bb.warn("patchelf-uninative --set-interpreter %s %s" % (d.getVar("UNINATIVE_LOADER", True), f)) | 86 | #bb.warn("patchelf-uninative --set-interpreter %s %s" % (d.getVar("UNINATIVE_LOADER", True), f)) |