From b9e1f1118e5afa11e3ea6f9ff1b070d99de4d5bd Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 6 Dec 2013 16:11:54 -0800 Subject: buildhistory.bbclass: Specify lang in decoding strings On systems where default locale is utf-8 we get errors like File: 'buildhistory.bbclass', lineno: 38, function: write_pkghistory 0034: if pkginfo.rconflicts: 0035: f.write("RCONFLICTS = %s\n" % pkginfo.rconflicts) 0036: f.write("PKGSIZE = %d\n" % pkginfo.size) 0037: f.write("FILES = %s\n" % pkginfo.files) *** 0038: f.write("FILELIST = %s\n" % pkginfo.filelist) 0039: 0040: for filevar in pkginfo.filevars: 0041: filevarpath = os.path.join(pkgpath, "latest.%s" % filevar) 0042: val = pkginfo.filevars[filevar] Exception: UnicodeEncodeError: 'ascii' codec can't encode character u'\xed' in position 337: ordinal not in range(128) This patch specifies decode to use utf-8 so ascii and utf-8 based locales both work (From OE-Core rev: 259b8718a31b886f8a158aeb5de164840c9a28b2) Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/classes/buildhistory.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/classes/buildhistory.bbclass') diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass index 757173ee2a..3590da0480 100644 --- a/meta/classes/buildhistory.bbclass +++ b/meta/classes/buildhistory.bbclass @@ -190,7 +190,7 @@ python buildhistory_emit_pkghistory() { key = item[0] if key.endswith('_' + pkg): key = key[:-len(pkg)-1] - pkgdata[key] = item[1].decode('string_escape') + pkgdata[key] = item[1].decode('utf-8', 'string_escape') pkge = pkgdata.get('PKGE', '0') pkgv = pkgdata['PKGV'] -- cgit v1.2.3-54-g00ecf