summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorVladimir Zapolskiy <vz@mleia.com>2016-08-06 04:43:29 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-10 10:46:33 +0100
commit6f2fa0a0186e5bfb823ed033ba4a7fcfff2c7834 (patch)
tree3eee8665c28569ad6ae8daefd0db90536d1d6335 /meta/classes
parentb30aeb3e32a6952b31d1e9086b7ab63e7d3d6954 (diff)
downloadpoky-6f2fa0a0186e5bfb823ed033ba4a7fcfff2c7834.tar.gz
package: 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: cdd9bae381deb15ac84e11a39f9d72f2757c1583) 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')
-rw-r--r--meta/classes/package.bbclass12
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 6aed4cac70..d0b2db6ae8 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1579,19 +1579,19 @@ python package_do_shlibs() {
1579 if file.endswith('.dylib') or file.endswith('.so'): 1579 if file.endswith('.dylib') or file.endswith('.so'):
1580 rpath = [] 1580 rpath = []
1581 p = sub.Popen([d.expand("${HOST_PREFIX}otool"), '-l', file],stdout=sub.PIPE,stderr=sub.PIPE) 1581 p = sub.Popen([d.expand("${HOST_PREFIX}otool"), '-l', file],stdout=sub.PIPE,stderr=sub.PIPE)
1582 err, out = p.communicate() 1582 out, err = p.communicate()
1583 # If returned successfully, process stderr for results 1583 # If returned successfully, process stdout for results
1584 if p.returncode == 0: 1584 if p.returncode == 0:
1585 for l in err.split("\n"): 1585 for l in out.split("\n"):
1586 l = l.strip() 1586 l = l.strip()
1587 if l.startswith('path '): 1587 if l.startswith('path '):
1588 rpath.append(l.split()[1]) 1588 rpath.append(l.split()[1])
1589 1589
1590 p = sub.Popen([d.expand("${HOST_PREFIX}otool"), '-L', file],stdout=sub.PIPE,stderr=sub.PIPE) 1590 p = sub.Popen([d.expand("${HOST_PREFIX}otool"), '-L', file],stdout=sub.PIPE,stderr=sub.PIPE)
1591 err, out = p.communicate() 1591 out, err = p.communicate()
1592 # If returned successfully, process stderr for results 1592 # If returned successfully, process stdout for results
1593 if p.returncode == 0: 1593 if p.returncode == 0:
1594 for l in err.split("\n"): 1594 for l in out.split("\n"):
1595 l = l.strip() 1595 l = l.strip()
1596 if not l or l.endswith(":"): 1596 if not l or l.endswith(":"):
1597 continue 1597 continue