mirror of
https://git.yoctoproject.org/poky
synced 2026-09-15 06:49:33 +02:00
bitbake: toaster: use decode('utf-8') for binary data
Decoded binary data to utf-8 to fix the following error when runnign on python 3: TypeError: Type str doesn't support the buffer API [YOCTO #9584] (Bitbake rev: 752ea00919ef054622a51ce097923309934eff2b) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
46ed4fff34
commit
96ce543150
@@ -70,7 +70,7 @@ class LocalhostBEController(BuildEnvironmentController):
|
|||||||
raise ShellCmdException(err)
|
raise ShellCmdException(err)
|
||||||
else:
|
else:
|
||||||
logger.debug("localhostbecontroller: shellcmd success")
|
logger.debug("localhostbecontroller: shellcmd success")
|
||||||
return out
|
return out.decode('utf-8')
|
||||||
|
|
||||||
def getGitCloneDirectory(self, url, branch):
|
def getGitCloneDirectory(self, url, branch):
|
||||||
"""Construct unique clone directory name out of url and branch."""
|
"""Construct unique clone directory name out of url and branch."""
|
||||||
|
|||||||
@@ -54,7 +54,7 @@ class Command(BaseCommand):
|
|||||||
(out,err) = cmd.communicate()
|
(out,err) = cmd.communicate()
|
||||||
if cmd.returncode != 0:
|
if cmd.returncode != 0:
|
||||||
logging.warning("Error while importing layer vcs_url: git error: %s" % err)
|
logging.warning("Error while importing layer vcs_url: git error: %s" % err)
|
||||||
for line in out.split("\n"):
|
for line in out.decode('utf-8').split("\n"):
|
||||||
try:
|
try:
|
||||||
(name, path) = line.split("\t", 1)
|
(name, path) = line.split("\t", 1)
|
||||||
if name == remote_name:
|
if name == remote_name:
|
||||||
|
|||||||
@@ -1169,7 +1169,7 @@ class LayerIndexLayerSource(LayerSource):
|
|||||||
except URLError as e:
|
except URLError as e:
|
||||||
raise Exception("Failed to read %s: %s" % (path, e.reason))
|
raise Exception("Failed to read %s: %s" % (path, e.reason))
|
||||||
|
|
||||||
return json.loads(res.read())
|
return json.loads(res.read().decode('utf-8'))
|
||||||
|
|
||||||
# verify we can get the basic api
|
# verify we can get the basic api
|
||||||
try:
|
try:
|
||||||
|
|||||||
Reference in New Issue
Block a user