summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-11-02 16:46:20 +1300
committerPaul Eggleton <paul.eggleton@linux.intel.com>2016-11-03 15:55:07 +1300
commit9e31853e4294e146648d9388ecaa8340b19077c4 (patch)
tree39988debfea5981d61d38fda3b9f772caadcdeb0
parent98c6ebf1e05158c689e01b785d32757847cdb10c (diff)
downloadopenembedded-core-contrib-9e31853e4294e146648d9388ecaa8340b19077c4.tar.gz
openembedded-core-contrib-9e31853e4294e146648d9388ecaa8340b19077c4.tar.bz2
openembedded-core-contrib-9e31853e4294e146648d9388ecaa8340b19077c4.zip
devtool: update-recipe: decode output before treating it as a string
When you receive output from subprocess, with Python 3 it's a stream of bytes so you need to decode it before you can start treating it as a string. Fixes [YOCTO #10563]. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-rw-r--r--scripts/lib/devtool/standard.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index 4eff6f878b..32eac23a62 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -331,6 +331,7 @@ def _git_ls_tree(repodir, treeish='HEAD', recursive=False):
cmd.append('-r')
out, _ = bb.process.run(cmd, cwd=repodir)
ret = {}
+ out = out.decode('utf-8')
for line in out.split('\0'):
if line:
split = line.split(None, 4)