diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-30 14:20:04 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-30 14:20:04 +0100 |
| commit | f5356062443320c29a19cfd7113128caa185b221 (patch) | |
| tree | e1458660ec06896311c93ac6f17b1b4c5afc24c5 /meta/classes/debian.bbclass | |
| parent | 004ba67298e3e6e618df29597e9166c971a1941c (diff) | |
| download | openembedded-core-f5356062443320c29a19cfd7113128caa185b221.tar.gz openembedded-core-f5356062443320c29a19cfd7113128caa185b221.tar.bz2 openembedded-core-f5356062443320c29a19cfd7113128caa185b221.zip | |
Revert "meta: replace os.popen with subprocess.Popen"
This reverts commit e83d8e58a6b107eea87df0ec233a1bc932b2c6e as the conversion
is not correct. Its replacing readlines() calls which generate an array with
what are effectively strings. There are split("\n") calls missing in many
cases so this needs to be reverted until it gets fixed.
Diffstat (limited to 'meta/classes/debian.bbclass')
| -rw-r--r-- | meta/classes/debian.bbclass | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/meta/classes/debian.bbclass b/meta/classes/debian.bbclass index 963d11c129..3637e2ebe7 100644 --- a/meta/classes/debian.bbclass +++ b/meta/classes/debian.bbclass @@ -60,14 +60,10 @@ 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 - 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() + cmd = (d.getVar('BUILD_PREFIX', True) or "") + "objdump -p " + fp + " 2>/dev/null" + fd = os.popen(cmd) + lines = fd.readlines() + fd.close() for l in lines: m = re.match("\s+SONAME\s+([^\s]*)", l) if m and not m.group(1) in sonames: |