diff options
| author | Khem Raj <raj.khem@gmail.com> | 2013-12-06 16:11:54 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-12-10 17:42:44 +0000 |
| commit | b9e1f1118e5afa11e3ea6f9ff1b070d99de4d5bd (patch) | |
| tree | fc0547f80e5621be33c3c1e79b208b7fb7cf02f1 /meta/classes | |
| parent | 4848a52e890be757e0012c5de148e5fec0e057bc (diff) | |
| download | ast2050-yocto-poky-b9e1f1118e5afa11e3ea6f9ff1b070d99de4d5bd.zip ast2050-yocto-poky-b9e1f1118e5afa11e3ea6f9ff1b070d99de4d5bd.tar.gz | |
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 <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/buildhistory.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass index 757173e..3590da0 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'] |
