summaryrefslogtreecommitdiffstats
path: root/meta/classes/debian.bbclass
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2012-05-29 22:53:08 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-30 10:58:10 +0100
commite83d8e58a6b107eea87df0ec233a1bc932b2c6ea (patch)
tree7373c71af06a1cc504ee251615c80ae3c07e6347 /meta/classes/debian.bbclass
parent57f843146ed62c04c23bc380dc8cb38aba264f1c (diff)
downloadopenembedded-core-e83d8e58a6b107eea87df0ec233a1bc932b2c6ea.tar.gz
meta: replace os.popen with subprocess.Popen
Replace os.popen with subprocess.Popen since the older function would fail (more or less) silently if the executed program cannot be found There are both bb.process.run() and bb.process.Popen() which wraps the subprocess module, use it for simplifying the code. Note: We don't need the "2>/dev/null" or "2>&1" since bb.process.run() can handle it, it will raise exception when error occurs, we should handle the exception ourselves if we want to ignore the error. More info: http://docs.python.org/library/subprocess.html#subprocess-replacements [YOCTO #2454] Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/debian.bbclass')
-rw-r--r--meta/classes/debian.bbclass12
1 files changed, 8 insertions, 4 deletions
diff --git a/meta/classes/debian.bbclass b/meta/classes/debian.bbclass
index 3637e2ebe7..963d11c129 100644
--- a/meta/classes/debian.bbclass
+++ b/meta/classes/debian.bbclass
@@ -60,10 +60,14 @@ python debian_package_name_hook () {
for f in files:
if so_re.match(f):
fp = os.path.join(root, f)
- cmd = (d.getVar('BUILD_PREFIX', True) or "") + "objdump -p " + fp + " 2>/dev/null"
- fd = os.popen(cmd)
- lines = fd.readlines()
- fd.close()
+ cmd = (d.getVar('BUILD_PREFIX', True) or "") + "objdump -p " + fp
+ try:
+ lines = ""
+ lines = bb.process.run(cmd)[0]
+ # Some ".so" maybe ascii text, e.g: /usr/lib64/libpthread.so,
+ # ingore those errors.
+ except Exception:
+ sys.exc_clear()
for l in lines:
m = re.match("\s+SONAME\s+([^\s]*)", l)
if m and not m.group(1) in sonames: