summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorPatrick Ohly <patrick.ohly@intel.com>2016-06-10 10:04:51 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-12 23:47:17 +0100
commit21343ac500395e13b9b2e5ccab95543ca2a9cd8b (patch)
treec9fcbe69590c990c81d8f17131913dc845901c56 /meta/classes
parentb2b1a5fa46d889ac143be79a785eacd053f9e629 (diff)
downloadopenembedded-core-contrib-21343ac500395e13b9b2e5ccab95543ca2a9cd8b.tar.gz
openembedded-core-contrib-21343ac500395e13b9b2e5ccab95543ca2a9cd8b.tar.bz2
openembedded-core-contrib-21343ac500395e13b9b2e5ccab95543ca2a9cd8b.zip
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 <patrick.ohly@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/npm.bbclass4
1 files changed, 2 insertions, 2 deletions
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('_', '-'))
}