[OE-core] [PATCH] classes/buildhistory: fix expansion of escape sequences

Khem Raj raj.khem at gmail.com
Sat Jan 25 22:10:26 UTC 2014


Thanks for fixing it. Looks correct to me

Acked-by: Khem Raj <raj.khem at gmail.com>

On Sat, Jan 25, 2014 at 1:25 PM, Paul Eggleton
<paul.eggleton at linux.intel.com> wrote:
> 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>
> ---
>  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 e9a9c3b..debeea8 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']
> --
> 1.8.5.3
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core



More information about the Openembedded-core mailing list