[gnome-continuous-yocto/gnomeostree-3.28-rocko: 3427/8267] devtool: fix handling of unicode characters from subprocess stdout

[Emmanuele Bassi <ebassi src gnome org>]

commit bfd8c35c3f917e3806c8dfe36c98c70fbccbb3c9
Author: Jiajie Hu <jiajie hu intel com>
Date:   Fri Nov 11 14:02:18 2016 +0800

    devtool: fix handling of unicode characters from subprocess stdout
    
    In previous implementation, a UnicodeDecodeError exception will be
    raised if multi-byte encoded characters are printed by the subprocess.
    As an example, the following command will fail in an en_US.UTF-8
    environment because wget quotes its saving destination with '‘'(0xE2
    0x80 0x98), while just the first byte is provided for decoding:
    
        devtool add recipe http://example.com/source.tar.xz
    
    The patch fixes the issue by avoiding such kind of incomplete decoding.
    
    (From OE-Core rev: 1875ea92546d23abcab1b40b562477a0016f712d)
    
    Signed-off-by: Jiajie Hu <jiajie hu intel com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/lib/devtool/__init__.py |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/scripts/lib/devtool/__init__.py b/scripts/lib/devtool/__init__.py
index e675133..31ecb65 100644
--- a/scripts/lib/devtool/__init__.py
+++ b/scripts/lib/devtool/__init__.py
@@ -23,6 +23,7 @@ import sys
 import subprocess
 import logging
 import re
+import codecs
 
 logger = logging.getLogger('devtool')
 
@@ -67,10 +68,10 @@ def exec_watch(cmd, **options):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, **options
     )
 
+    reader = codecs.getreader('utf-8')(process.stdout)
     buf = ''
     while True:
-        out = process.stdout.read(1)
-        out = out.decode('utf-8')
+        out = reader.read(1, 1)
         if out:
             sys.stdout.write(out)
             sys.stdout.flush()