mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-07 23:02:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "ipk: Decode byte data to string in manifest handling"

Browse Source 
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>
This commit is contained in:
Andrew Jeffery
2023-05-05 22:49:54 +09:30
committed by Richard Purdie
parent a9d52e2621
commit 1ced55d221
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
meta/lib/oe/package_manager/ipk/manifest.py
View File

@@ -64,7 +64,7 @@ class PkgManifest(Manifest):
if len(pkgs_to_install) == 0:
return
output = pm.dummy_install(pkgs_to_install).decode('utf-8')
output = pm.dummy_install(pkgs_to_install)
with open(self.full_manifest, 'w+') as manifest:
pkg_re = re.compile('^Installing ([^ ]+) [^ ].*')