diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-09 16:31:22 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-16 23:32:39 +0100 |
commit | 1fc840ffc0267ecf3a15c4a59ab44869ef1d6339 (patch) | |
tree | b2932a0d0d7146bde799db47497236063050fc84 /meta/lib/oe/packagedata.py | |
parent | 22c8ed6484e0ee9328e3844c9e794f3d89ebb9f7 (diff) | |
download | poky-1fc840ffc0267ecf3a15c4a59ab44869ef1d6339.tar.gz |
meta: python3 megapatch
This needs splutting into smaller units, WIP atm.
(From OE-Core rev: 21529228a7dca96a6a1b44ed9380c523efdeeb3e)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe/packagedata.py')
-rw-r--r-- | meta/lib/oe/packagedata.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oe/packagedata.py b/meta/lib/oe/packagedata.py index bc0fd06bce..21d4de914f 100644 --- a/meta/lib/oe/packagedata.py +++ b/meta/lib/oe/packagedata.py | |||
@@ -8,7 +8,7 @@ def read_pkgdatafile(fn): | |||
8 | pkgdata = {} | 8 | pkgdata = {} |
9 | 9 | ||
10 | def decode(str): | 10 | def decode(str): |
11 | c = codecs.getdecoder("string_escape") | 11 | c = codecs.getdecoder("unicode_escape") |
12 | return c(str)[0] | 12 | return c(str)[0] |
13 | 13 | ||
14 | if os.access(fn, os.R_OK): | 14 | if os.access(fn, os.R_OK): |
@@ -66,7 +66,7 @@ def _pkgmap(d): | |||
66 | bb.warn("No files in %s?" % pkgdatadir) | 66 | bb.warn("No files in %s?" % pkgdatadir) |
67 | files = [] | 67 | files = [] |
68 | 68 | ||
69 | for pn in filter(lambda f: not os.path.isdir(os.path.join(pkgdatadir, f)), files): | 69 | for pn in [f for f in files if not os.path.isdir(os.path.join(pkgdatadir, f))]: |
70 | try: | 70 | try: |
71 | pkgdata = read_pkgdatafile(os.path.join(pkgdatadir, pn)) | 71 | pkgdata = read_pkgdatafile(os.path.join(pkgdatadir, pn)) |
72 | except OSError: | 72 | except OSError: |