summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorZheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>2019-04-10 23:44:10 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-04-12 09:29:06 +0100
commit5ad7d90ee631146eab2286466fec928f418ec20c (patch)
treea5a634f83a4681783e4b3d13cd05d3631dbe980c /meta/classes
parent9f7092416c40a96d9567bde99475de15a30e4989 (diff)
downloadpoky-5ad7d90ee631146eab2286466fec928f418ec20c.tar.gz
sanity: check_perl_modules bug fix
Fix Python3 TypeError error in check_perl_modules: Executing bitbake, the following error message will be throwed: File ".../poky/meta/classes/sanity.bbclass", line 979, in check_sanity_eventhandler check_sanity(sanity_data) File ".../poky/meta/classes/sanity.bbclass", line 943, in check_sanity check_sanity_version_change(status, sanity_data) File ".../poky/meta/classes/sanity.bbclass", line 637, in check_sanity_version_change status.addresult(check_perl_modules(d)) File ".../poky/meta/classes/sanity.bbclass", line 563, in check_perl_modules errresult += e.output TypeError: must be str, not bytes So here, transfer e.output from bytes to str. (From OE-Core rev: 2c6fff3fe315357d65d082679856615afc367d90) Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/sanity.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 4cbb1f3a61..9429202dca 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -560,7 +560,7 @@ def check_perl_modules(sanity_data):
560 try: 560 try:
561 subprocess.check_output(["perl", "-e", "use %s" % m]) 561 subprocess.check_output(["perl", "-e", "use %s" % m])
562 except subprocess.CalledProcessError as e: 562 except subprocess.CalledProcessError as e:
563 errresult += e.output 563 errresult += bytes.decode(e.output)
564 ret += "%s " % m 564 ret += "%s " % m
565 if ret: 565 if ret:
566 return "Required perl module(s) not found: %s\n\n%s\n" % (ret, errresult) 566 return "Required perl module(s) not found: %s\n\n%s\n" % (ret, errresult)