summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Vuille <jpmv27@yahoo.com>2016-11-27 15:02:37 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-11-30 15:48:08 +0000
commitb7deb1f046fc4f5ae2c1e1b3be0dce9b131c2f28 (patch)
treec84897fa43037dabe38edb11d8ac3c4cf34c3aa6
parent2c4116d3cbeac12b0c9d0fc6da9592eb3b8dce3b (diff)
downloadopenembedded-core-contrib-b7deb1f046fc4f5ae2c1e1b3be0dce9b131c2f28.tar.gz
openembedded-core-contrib-b7deb1f046fc4f5ae2c1e1b3be0dce9b131c2f28.tar.bz2
openembedded-core-contrib-b7deb1f046fc4f5ae2c1e1b3be0dce9b131c2f28.zip
terminal.py: Pass string instead of bytes to ExecutionError to avoid exception
Based on run() in bitbake/lib/bb/process.py, ExecutionError() expects strings not bytes. Passing bytes results in a "TypeError: Can't convert 'bytes' object to str implicitly" exception. Fixes Bug 10729 (From OE-Core rev: 063b63d4d324c23322ac1b6b7c7928e725d7b968) Signed-off-by: Martin Vuille <jpmv27@yahoo.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oe/terminal.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/lib/oe/terminal.py b/meta/lib/oe/terminal.py
index 38e66cef1f..a89fa45691 100644
--- a/meta/lib/oe/terminal.py
+++ b/meta/lib/oe/terminal.py
@@ -239,6 +239,8 @@ def spawn(name, sh_cmd, title=None, env=None, d=None):
pipe = terminal(sh_cmd, title, env, d)
output = pipe.communicate()[0]
+ if output:
+ output = output.decode("utf-8")
if pipe.returncode != 0:
raise ExecutionError(sh_cmd, pipe.returncode, output)