summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiajie Hu <jiajie.hu@intel.com>2016-11-11 14:02:18 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-11-23 11:02:33 +0000
commit1875ea92546d23abcab1b40b562477a0016f712d (patch)
treeee551a27e834f2f0daf65f94f9aefab527826697
parentd225558aefa8abe0e2d975a0b811a4d73b0ed563 (diff)
downloadopenembedded-core-contrib-1875ea92546d23abcab1b40b562477a0016f712d.tar.gz
openembedded-core-contrib-1875ea92546d23abcab1b40b562477a0016f712d.tar.bz2
openembedded-core-contrib-1875ea92546d23abcab1b40b562477a0016f712d.zip
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. Signed-off-by: Jiajie Hu <jiajie.hu@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--scripts/lib/devtool/__init__.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/lib/devtool/__init__.py b/scripts/lib/devtool/__init__.py
index e675133f63..31ecb65937 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()