From 21343ac500395e13b9b2e5ccab95543ca2a9cd8b Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Fri, 10 Jun 2016 10:04:51 +0200 Subject: npm.bbclass: avoid str/byte conversion problems for PKGV and SUMMARY In Python3, str.encode() returns byte strings, which later are not converted back to strings automatically, leading to "TypeError: Can't convert 'bytes' object to str implicitly" in code which reads PKGV and SUMMARY and expects to find strings there. The npm.bbclass must use values for d.setVar() that meet that expectation, and thus the redundant (and in Python3, harmful) .encode() gets removed. (From OE-Core rev: 241e094bcd9212204350f9855257474908f82a3c) Signed-off-by: Patrick Ohly Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/classes/npm.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/classes') diff --git a/meta/classes/npm.bbclass b/meta/classes/npm.bbclass index d0d3d8fa03..95be7518a8 100644 --- a/meta/classes/npm.bbclass +++ b/meta/classes/npm.bbclass @@ -46,10 +46,10 @@ python populate_packages_prepend () { if pdata: version = pdata.get('version', None) if version: - d.setVar('PKGV_%s' % expanded_pkgname, version.encode("utf8")) + d.setVar('PKGV_%s' % expanded_pkgname, version) description = pdata.get('description', None) if description: - d.setVar('SUMMARY_%s' % expanded_pkgname, description.replace(u"\u2018", "'").replace(u"\u2019", "'").encode("utf8")) + d.setVar('SUMMARY_%s' % expanded_pkgname, description.replace(u"\u2018", "'").replace(u"\u2019", "'")) d.appendVar('RDEPENDS_%s' % d.getVar('PN', True), ' %s' % ' '.join(pkgnames).replace('_', '-')) } -- cgit 1.2.3-korg