summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2017-03-20 17:07:04 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-22 11:35:22 +0000
commit1485a5517a38fe96cdf7140e26b2bf8b58aebeb5 (patch)
treef326c6ddd52b1e73db302e7a43de5555c26c2989
parent5b1807021e932b1150095f3d1744d8411a28a1f0 (diff)
downloadpoky-1485a5517a38fe96cdf7140e26b2bf8b58aebeb5.tar.gz
bitbake: bitbake-layers: fix layerindex-fetch for Python 3
The data we read from an HTTPConnection comes in the form of bytes, but we need it as a string, so in Python 3 we need to decode it (missed in the Python 3 migration). (Bitbake rev: 7e6a3cd1472e1a1c8304b46611e1676914a68b59) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bblayers/layerindex.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/bblayers/layerindex.py b/bitbake/lib/bblayers/layerindex.py
index 013e952f38..506c1109de 100644
--- a/bitbake/lib/bblayers/layerindex.py
+++ b/bitbake/lib/bblayers/layerindex.py
@@ -56,7 +56,7 @@ class LayerIndexPlugin(ActionPlugin):
56 r = conn.getresponse() 56 r = conn.getresponse()
57 if r.status != 200: 57 if r.status != 200:
58 raise Exception("Failed to read " + path + ": %d %s" % (r.status, r.reason)) 58 raise Exception("Failed to read " + path + ": %d %s" % (r.status, r.reason))
59 return json.loads(r.read()) 59 return json.loads(r.read().decode())
60 60
61 def get_layer_deps(self, layername, layeritems, layerbranches, layerdependencies, branchnum, selfname=False): 61 def get_layer_deps(self, layername, layeritems, layerbranches, layerdependencies, branchnum, selfname=False):
62 def layeritems_info_id(items_name, layeritems): 62 def layeritems_info_id(items_name, layeritems):