summaryrefslogtreecommitdiffstats
path: root/meta/lib/oe
diff options
context:
space:
mode:
authorAndrew Jeffery <andrew@aj.id.au>2023-05-05 22:49:54 +0930
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-05-09 07:50:14 +0100
commit1ced55d22101049ecaaac393faefaa5494df1887 (patch)
treef016e304787b8593335df83ee68ed3840f8ef58d /meta/lib/oe
parenta9d52e2621e958d9ba63cec3b6f6e571ecbb3d97 (diff)
downloadpoky-1ced55d22101049ecaaac393faefaa5494df1887.tar.gz
Revert "ipk: Decode byte data to string in manifest handling"
cf9df9e8d89f ("ipk: Decode byte data to string in manifest handling") did a bit of least-effort fix to a string vs byte sequence issue in the manifest handling. The approach was chosen as it localised the fix, rather than having to analyse further call sites. However since then f2167ae80258 ("package_manager/ipk: do not pipe stderr to stdout") was applied, reworking the output handling from the subcommand. dummy_bytes() now returns a string, so stop trying to decode it. Fixes: f2167ae80258 ("package_manager/ipk: do not pipe stderr to stdout") Cc: Curtis Meier <cmeier@us.ibm.com> Cc: Pam Eggler <eggler@us.ibm.com> (From OE-Core rev: b61739554780d70307d2b6b37d2b3b1c7df93c77) (From OE-Core rev: 07e5a6331be60d5e35d7336a6215a972ced6eb57) Signed-off-by: Andrew Jeffery <andrew@aj.id.au> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe')
-rw-r--r--meta/lib/oe/package_manager/ipk/manifest.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oe/package_manager/ipk/manifest.py b/meta/lib/oe/package_manager/ipk/manifest.py
index 469e14c3c6..3549d7428d 100644
--- a/meta/lib/oe/package_manager/ipk/manifest.py
+++ b/meta/lib/oe/package_manager/ipk/manifest.py
@@ -64,7 +64,7 @@ class PkgManifest(Manifest):
64 if len(pkgs_to_install) == 0: 64 if len(pkgs_to_install) == 0:
65 return 65 return
66 66
67 output = pm.dummy_install(pkgs_to_install).decode('utf-8') 67 output = pm.dummy_install(pkgs_to_install)
68 68
69 with open(self.full_manifest, 'w+') as manifest: 69 with open(self.full_manifest, 'w+') as manifest:
70 pkg_re = re.compile('^Installing ([^ ]+) [^ ].*') 70 pkg_re = re.compile('^Installing ([^ ]+) [^ ].*')