diff options
author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2016-06-02 13:13:00 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-03 13:13:29 +0100 |
commit | 4e36eeee7797ed1e3418b3ccb81797211edab573 (patch) | |
tree | b88f5a54e1c8d35d423c309e17f5c5d6c06bc5b2 /scripts/combo-layer | |
parent | a8314b9531c82d8e9a33792af8a804da2ad2a8fb (diff) | |
download | poky-4e36eeee7797ed1e3418b3ccb81797211edab573.tar.gz |
scripts: python3: decode subprocess output
stdeout and stderr content returned by subprocess API has different
types in Python 3(bytes) and Python 2(string). Decoding it to
'utf-8' makes it unicode on both pythons.
(From OE-Core rev: ae4d36375683b6cfd48af25bfca70b2e77f7ade5)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/combo-layer')
-rwxr-xr-x | scripts/combo-layer | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/combo-layer b/scripts/combo-layer index 36a8f5fa1e..eaa7f5adb8 100755 --- a/scripts/combo-layer +++ b/scripts/combo-layer | |||
@@ -198,7 +198,7 @@ def runcmd(cmd,destdir=None,printerr=True,out=None,env=None): | |||
198 | raise e | 198 | raise e |
199 | 199 | ||
200 | err.seek(0) | 200 | err.seek(0) |
201 | output = err.read() | 201 | output = err.read().decode('utf-8') |
202 | logger.debug("output: %s" % output.replace(chr(0), '\\0')) | 202 | logger.debug("output: %s" % output.replace(chr(0), '\\0')) |
203 | return output | 203 | return output |
204 | 204 | ||