[oe-commits] Paul Eggleton : classes/buildhistory: fix expansion of escape sequences

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 15e0cdff08b8b9b826bbb9f00192a27318a3ee65
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=15e0cdff08b8b9b826bbb9f00192a27318a3ee65

Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date:   Sat Jan 25 21:25:05 2014 +0000

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.

Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/classes/buildhistory.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index 545a42f..6b097ea 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('utf-8', 'string_escape')
+                pkgdata[key] = item[1].decode('utf-8').decode('string_escape')
 
         pkge = pkgdata.get('PKGE', '0')
         pkgv = pkgdata['PKGV']