summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2014-01-25 21:25:05 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-03 11:57:09 +0000
commit220f4f5806c1f6f93e3d5a3cf3c66d13530199c6 (patch)
treed0e24ffdc57640cf8614abbc8e7ebcdff383a773
parentb37dd451a52622d5b570183a81583cc34c2ff555 (diff)
downloadpoky-220f4f5806c1f6f93e3d5a3cf3c66d13530199c6.tar.gz
classes/buildhistory: fix expansion of escape sequences
OE-Core commit 259b8718a31b886f8a158aeb5de164840c9a28b2 fixed UTF-8 errors but broke decoding of escape sequences in strings (e.g. pkg_postinst scripts had \n \t in them instead of newlines and tabs.) We need a second call to decode() here as specifying 'string_escape' as the second parameter won't do anything. (From OE-Core rev: 15e0cdff08b8b9b826bbb9f00192a27318a3ee65) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/buildhistory.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index 545a42fe91..6b097ea20f 100644
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -190,7 +190,7 @@ python buildhistory_emit_pkghistory() {
190 key = item[0] 190 key = item[0]
191 if key.endswith('_' + pkg): 191 if key.endswith('_' + pkg):
192 key = key[:-len(pkg)-1] 192 key = key[:-len(pkg)-1]
193 pkgdata[key] = item[1].decode('utf-8', 'string_escape') 193 pkgdata[key] = item[1].decode('utf-8').decode('string_escape')
194 194
195 pkge = pkgdata.get('PKGE', '0') 195 pkge = pkgdata.get('PKGE', '0')
196 pkgv = pkgdata['PKGV'] 196 pkgv = pkgdata['PKGV']