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>
This commit is contained in:
Jiajie Hu 2016-11-11 14:02:18 +08:00 committed by Richard Purdie
parent 8c84830fa1
commit bfd8c35c3f
1 changed files with 3 additions and 2 deletions

View File

@ -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()