aboutsummaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorPhil Blundell <philb@gnu.org>2012-10-17 20:34:58 +0000
committerMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2012-11-29 12:00:21 +0100
commit91afc7d8ece7bbfcc7f827bf9bf5b39ca830bd1b (patch)
treee705b21f41727c9d365c1c526b70019a6dd6d09b /meta/lib
parentd85e44b3ce3487ef4f21413f995c9257d754a463 (diff)
downloadopenembedded-core-contrib-91afc7d8ece7bbfcc7f827bf9bf5b39ca830bd1b.tar.gz
lib/oe/qa: Trap exceptions when running objdump
This avoids propagating a failure if we encounter an ELF file that objdump can't parse for any reason. Some versions and/or configurations of objdump will refuse to read files for "the wrong" architecture. Signed-off-by: Phil Blundell <pb@pbcl.net> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oe/qa.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/meta/lib/oe/qa.py b/meta/lib/oe/qa.py
index 9e5ab587b7..12dcd1fa49 100644
--- a/meta/lib/oe/qa.py
+++ b/meta/lib/oe/qa.py
@@ -102,5 +102,10 @@ class ELFFile:
env = os.environ
env["LC_ALL"] = "C"
- self.objdump_output[cmd] = bb.process.run([ os.path.join(staging_dir, objdump), cmd, self.name ], env=env, shell=False)[0]
- return self.objdump_output[cmd]
+ try:
+ bb.note("%s %s %s" % (objdump, cmd, self.name))
+ self.objdump_output[cmd] = bb.process.run([ os.path.join(staging_dir, objdump), cmd, self.name ], env=env, shell=False)[0]
+ return self.objdump_output[cmd]
+ except Exception, e:
+ bb.note("%s %s %s failed: %s" % (objdump, cmd, self.name, e))
+ return ""