summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Jeffery <andrew@aj.id.au>2023-05-05 22:49:54 +0930
committerSteve Sakoman <steve@sakoman.com>2023-06-21 04:00:58 -1000
commit5e0dd7be76446e4e1829819e6b6d39cb3df8aca7 (patch)
treef1f0434c0b212d054e1f0b777f2d5a5b97eb53b8
parent8bc1f7e01532815df80949a92dc10b596df93fb0 (diff)
downloadpoky-5e0dd7be76446e4e1829819e6b6d39cb3df8aca7.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: 0e17a5a4f0e3301bf78f77bb5ca4aaf3e4dbc7af) Signed-off-by: Andrew Jeffery <andrew@aj.id.au> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> (cherry picked from commit 07e5a6331be60d5e35d7336a6215a972ced6eb57) Signed-off-by: Steve Sakoman <steve@sakoman.com>
-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 ae451c5c70..22669f97c0 100644
--- a/meta/lib/oe/package_manager/ipk/manifest.py
+++ b/meta/lib/oe/package_manager/ipk/manifest.py
@@ -62,7 +62,7 @@ class PkgManifest(Manifest):
62 if len(pkgs_to_install) == 0: 62 if len(pkgs_to_install) == 0:
63 return 63 return
64 64
65 output = pm.dummy_install(pkgs_to_install).decode('utf-8') 65 output = pm.dummy_install(pkgs_to_install)
66 66
67 with open(self.full_manifest, 'w+') as manifest: 67 with open(self.full_manifest, 'w+') as manifest:
68 pkg_re = re.compile('^Installing ([^ ]+) [^ ].*') 68 pkg_re = re.compile('^Installing ([^ ]+) [^ ].*')