[gnome-continuous-yocto/gnomeostree-3.28-rocko: 293/8267] wic: decode output of subprocess.communicate

[Emmanuele Bassi <ebassi src gnome org>]

commit a173885ccfcff1099fa47c0f84913d14ac26079f
Author: Ed Bartosh <ed bartosh linux intel com>
Date:   Wed May 4 16:06:25 2016 +0300

    wic: decode output of subprocess.communicate
    
    stdeout and stderr content returned by communicate API has different
    types in Python 3(bytes) and Python 2(string). Decoding it to 'utf-8'
    makes it unicode on both pythons.
    
    Decoded stdout and stderr output to utf-8 to make the code
    working under both Python 2 and Python 3.
    
    (From OE-Core rev: 5b556f58a171e3d45107bb56a1f780e5c1abba37)
    
    Signed-off-by: Ed Bartosh <ed bartosh linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/lib/wic/utils/runner.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/scripts/lib/wic/utils/runner.py b/scripts/lib/wic/utils/runner.py
index 737751b..db536ba 100644
--- a/scripts/lib/wic/utils/runner.py
+++ b/scripts/lib/wic/utils/runner.py
@@ -65,8 +65,8 @@ def runtool(cmdln_or_args, catch=1):
         process = subprocess.Popen(cmdln_or_args, stdout=sout,
                                    stderr=serr, shell=shell)
         (sout, serr) = process.communicate()
-        # combine stdout and stderr, filter None out
-        out = ''.join(filter(None, [sout, serr]))
+        # combine stdout and stderr, filter None out and decode
+        out = ''.join([out.decode('utf-8') for out in [sout, serr] if out])
     except OSError as err:
         if err.errno == 2:
             # [Errno 2] No such file or directory