mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-02 01:19:52 +00:00
Code Issues Projects Releases Wiki Activity

meta: replace os.popen with subprocess.Popen

Browse Source 
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]

(From OE-Core rev: e83d8e58a6b107eea87df0ec233a1bc932b2c6ea)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Robert Yang
2012-05-29 22:53:08 +08:00
committed by Richard Purdie
parent d760fb97f5
commit 5996b2b58e
7 changed files with 53 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/package.bbclass
+10 -6
View File
@@ -1061,7 +1061,7 @@ python emit_pkgdata() {
def get_directory_size(dir):
if os.listdir(dir):
size = int(os.popen('du -sk %s' % dir).readlines()[0].split('\t')[0])
size = int(bb.process.run('du -sk %s' % dir)[0].split('\t')[0])
else:
size = 0
return size
@@ -1221,7 +1221,7 @@ python package_do_filedeps() {
rpfiles.append(os.path.join(root, file))
for files in chunks(rpfiles, 100):
dep_pipe = os.popen(rpmdeps + " " + " ".join(files))
dep_pipe = bb.process.Popen(rpmdeps + " " + " ".join(files), shell=True).stdout
process_deps(dep_pipe, pkg, provides_files, requires_files)
@@ -1263,11 +1263,15 @@ python package_do_shlibs() {
def linux_so(root, path, file):
needs_ldconfig = False
cmd = d.getVar('OBJDUMP', True) + " -p " + pipes.quote(os.path.join(root, file)) + " 2>/dev/null"
cmd = d.getVar('OBJDUMP', True) + " -p " + pipes.quote(os.path.join(root, file))
cmd = "PATH=\"%s\" %s" % (d.getVar('PATH', True), cmd)
fd = os.popen(cmd)
lines = fd.readlines()
fd.close()
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+NEEDED\s+([^\s]*)", l)
if m: