From f0a56f6d15d64b9f909628e7724a3aca9d677091 Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Wed, 17 Oct 2012 20:34:58 +0000 Subject: 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. (From OE-Core rev: 11f5998e539f7b884ae1387252f8995b2dc7437f) Signed-off-by: Phil Blundell Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/lib/oe/qa.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'meta/lib') 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 "" -- cgit v1.2.3-54-g00ecf