[gnome-continuous-yocto/gnomeostree-3.28-rocko: 1770/8267] chrpath: correct subprocess.Popen.communicate() return values

[Emmanuele Bassi <ebassi src gnome org>]

commit b30aeb3e32a6952b31d1e9086b7ab63e7d3d6954
Author: Vladimir Zapolskiy <vz mleia com>
Date:   Sat Aug 6 04:43:28 2016 +0300

    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>

 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 cdd7f27..72e8a12 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):
     import subprocess as sub
 
     p = sub.Popen([cmd, '-l', fpath],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:
         return
 
-    err = err.decode('utf-8')
+    out = out.decode('utf-8')
 
     # Handle RUNPATH as well as RPATH
-    err = err.replace("RUNPATH=","RPATH=")
+    out = out.replace("RUNPATH=","RPATH=")
     # Throw away everything other than the rpath list
-    curr_rpath = err.partition("RPATH=")[2]
+    curr_rpath = out.partition("RPATH=")[2]
     #bb.note("Current rpath for %s is %s" % (fpath, curr_rpath.strip()))
     rpaths = curr_rpath.split(":")
     new_rpaths = []
@@ -46,11 +46,11 @@ def process_file_darwin(cmd, fpath, rootdir, baseprefix, tmpdir, d):
     import subprocess as sub
 
     p = sub.Popen([d.expand("${HOST_PREFIX}otool"), '-L', fpath],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:
         return
-    for l in err.split("\n"):
+    for l in out.split("\n"):
         if "(compatibility" not in l:
             continue
         rpath = l.partition("(compatibility")[0].strip()
@@ -59,7 +59,7 @@ def process_file_darwin(cmd, fpath, rootdir, baseprefix, tmpdir, d):
 
         newpath = "@loader_path/" + os.path.relpath(rpath, os.path.dirname(fpath.replace(rootdir, "/")))
         p = sub.Popen([d.expand("${HOST_PREFIX}install_name_tool"), '-change', rpath, newpath, 
fpath],stdout=sub.PIPE,stderr=sub.PIPE)
-        err, out = p.communicate()
+        out, err = p.communicate()
 
 def process_dir (rootdir, directory, d):
     import stat