diff options
author | Vladimir Zapolskiy <vz@mleia.com> | 2016-08-06 04:43:28 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-08-10 10:46:33 +0100 |
commit | b30aeb3e32a6952b31d1e9086b7ab63e7d3d6954 (patch) | |
tree | c23ecc22704c6f81025660ccf6a194e668877b65 /meta/classes/chrpath.bbclass | |
parent | a48fea275b08ff3d3dfc9a928aeb04768db35873 (diff) | |
download | poky-b30aeb3e32a6952b31d1e9086b7ab63e7d3d6954.tar.gz |
chrpath: correct subprocess.Popen.communicate() return values
This is a non-functional change, which intends to correct element
names of a tuple returned by Popen.communicate().
Both in python2 and python3 subprocess.Popen.communicate() method
returns a tuple (stdoutdata, stderrdata), thus old assignments and
collateral comments are incorrect from human's point of view, however
formally there is no error in the code.
The change is desired to have to avoid copy-paste errors in future.
(From OE-Core rev: f8c21df86bae5a85e221b69b91b347aeba6be4c3)
Signed-off-by: Vladimir Zapolskiy <vz@mleia.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/chrpath.bbclass')
-rw-r--r-- | meta/classes/chrpath.bbclass | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/meta/classes/chrpath.bbclass b/meta/classes/chrpath.bbclass index cdd7f27600..72e8a122e3 100644 --- a/meta/classes/chrpath.bbclass +++ b/meta/classes/chrpath.bbclass | |||
@@ -5,17 +5,17 @@ def process_file_linux(cmd, fpath, rootdir, baseprefix, tmpdir, d): | |||
5 | import subprocess as sub | 5 | import subprocess as sub |
6 | 6 | ||
7 | p = sub.Popen([cmd, '-l', fpath],stdout=sub.PIPE,stderr=sub.PIPE) | 7 | p = sub.Popen([cmd, '-l', fpath],stdout=sub.PIPE,stderr=sub.PIPE) |
8 | err, out = p.communicate() | 8 | out, err = p.communicate() |
9 | # If returned successfully, process stderr for results | 9 | # If returned successfully, process stdout for results |
10 | if p.returncode != 0: | 10 | if p.returncode != 0: |
11 | return | 11 | return |
12 | 12 | ||
13 | err = err.decode('utf-8') | 13 | out = out.decode('utf-8') |
14 | 14 | ||
15 | # Handle RUNPATH as well as RPATH | 15 | # Handle RUNPATH as well as RPATH |
16 | err = err.replace("RUNPATH=","RPATH=") | 16 | out = out.replace("RUNPATH=","RPATH=") |
17 | # Throw away everything other than the rpath list | 17 | # Throw away everything other than the rpath list |
18 | curr_rpath = err.partition("RPATH=")[2] | 18 | curr_rpath = out.partition("RPATH=")[2] |
19 | #bb.note("Current rpath for %s is %s" % (fpath, curr_rpath.strip())) | 19 | #bb.note("Current rpath for %s is %s" % (fpath, curr_rpath.strip())) |
20 | rpaths = curr_rpath.split(":") | 20 | rpaths = curr_rpath.split(":") |
21 | new_rpaths = [] | 21 | new_rpaths = [] |
@@ -46,11 +46,11 @@ def process_file_darwin(cmd, fpath, rootdir, baseprefix, tmpdir, d): | |||
46 | import subprocess as sub | 46 | import subprocess as sub |
47 | 47 | ||
48 | p = sub.Popen([d.expand("${HOST_PREFIX}otool"), '-L', fpath],stdout=sub.PIPE,stderr=sub.PIPE) | 48 | p = sub.Popen([d.expand("${HOST_PREFIX}otool"), '-L', fpath],stdout=sub.PIPE,stderr=sub.PIPE) |
49 | err, out = p.communicate() | 49 | out, err = p.communicate() |
50 | # If returned successfully, process stderr for results | 50 | # If returned successfully, process stdout for results |
51 | if p.returncode != 0: | 51 | if p.returncode != 0: |
52 | return | 52 | return |
53 | for l in err.split("\n"): | 53 | for l in out.split("\n"): |
54 | if "(compatibility" not in l: | 54 | if "(compatibility" not in l: |
55 | continue | 55 | continue |
56 | rpath = l.partition("(compatibility")[0].strip() | 56 | rpath = l.partition("(compatibility")[0].strip() |
@@ -59,7 +59,7 @@ def process_file_darwin(cmd, fpath, rootdir, baseprefix, tmpdir, d): | |||
59 | 59 | ||
60 | newpath = "@loader_path/" + os.path.relpath(rpath, os.path.dirname(fpath.replace(rootdir, "/"))) | 60 | newpath = "@loader_path/" + os.path.relpath(rpath, os.path.dirname(fpath.replace(rootdir, "/"))) |
61 | p = sub.Popen([d.expand("${HOST_PREFIX}install_name_tool"), '-change', rpath, newpath, fpath],stdout=sub.PIPE,stderr=sub.PIPE) | 61 | p = sub.Popen([d.expand("${HOST_PREFIX}install_name_tool"), '-change', rpath, newpath, fpath],stdout=sub.PIPE,stderr=sub.PIPE) |
62 | err, out = p.communicate() | 62 | out, err = p.communicate() |
63 | 63 | ||
64 | def process_dir (rootdir, directory, d): | 64 | def process_dir (rootdir, directory, d): |
65 | import stat | 65 | import stat |