diff options
author | Phil Blundell <philb@gnu.org> | 2012-10-17 20:34:58 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-18 12:13:49 +0100 |
commit | f0a56f6d15d64b9f909628e7724a3aca9d677091 (patch) | |
tree | d2aae4edc29e305b85467174322266270676a63b /meta | |
parent | 0fd014eadac6451d7be40d7332d14c5bcd84dfea (diff) | |
download | poky-f0a56f6d15d64b9f909628e7724a3aca9d677091.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.
(From OE-Core rev: 11f5998e539f7b884ae1387252f8995b2dc7437f)
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')
-rw-r--r-- | meta/lib/oe/qa.py | 9 |
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: | |||
102 | env = os.environ | 102 | env = os.environ |
103 | env["LC_ALL"] = "C" | 103 | env["LC_ALL"] = "C" |
104 | 104 | ||
105 | self.objdump_output[cmd] = bb.process.run([ os.path.join(staging_dir, objdump), cmd, self.name ], env=env, shell=False)[0] | 105 | try: |
106 | return self.objdump_output[cmd] | 106 | bb.note("%s %s %s" % (objdump, cmd, self.name)) |
107 | self.objdump_output[cmd] = bb.process.run([ os.path.join(staging_dir, objdump), cmd, self.name ], env=env, shell=False)[0] | ||
108 | return self.objdump_output[cmd] | ||
109 | except Exception, e: | ||
110 | bb.note("%s %s %s failed: %s" % (objdump, cmd, self.name, e)) | ||
111 | return "" | ||