[oe-commits] [openembedded-core] 35/51: package: correct subprocess.Popen.communicate() return values

[git at git.openembedded.org]

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit cdd9bae381deb15ac84e11a39f9d72f2757c1583
Author: Vladimir Zapolskiy <vz at mleia.com>
AuthorDate: Sat Aug 6 04:43:29 2016 +0300

    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.
    
    Signed-off-by: Vladimir Zapolskiy <vz at mleia.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/classes/package.bbclass | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 6aed4ca..d0b2db6 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1579,19 +1579,19 @@ python package_do_shlibs() {
         if file.endswith('.dylib') or file.endswith('.so'):
             rpath = []
             p = sub.Popen([d.expand("${HOST_PREFIX}otool"), '-l', file],stdout=sub.PIPE,stderr=sub.PIPE)
-            err, out = p.communicate()
-            # If returned successfully, process stderr for results
+            out, err = p.communicate()
+            # If returned successfully, process stdout for results
             if p.returncode == 0:
-                for l in err.split("\n"):
+                for l in out.split("\n"):
                     l = l.strip()
                     if l.startswith('path '):
                         rpath.append(l.split()[1])
 
         p = sub.Popen([d.expand("${HOST_PREFIX}otool"), '-L', file],stdout=sub.PIPE,stderr=sub.PIPE)
-        err, out = p.communicate()
-        # If returned successfully, process stderr for results
+        out, err = p.communicate()
+        # If returned successfully, process stdout for results
         if p.returncode == 0:
-            for l in err.split("\n"):
+            for l in out.split("\n"):
                 l = l.strip()
                 if not l or l.endswith(":"):
                     continue

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.