commit: 935d1432b2ea42fc0a49b9e3368a1766a673e1a9 Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Sat Oct 21 01:31:44 2023 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Sun Oct 22 04:36:43 2023 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=935d1432
_emerge: Fix NameError 'pkg' bug 915551 Use (pkg.cpv, pkg.root) to lookup package instances corresponding to die messages. Bug: https://bugs.gentoo.org/915551 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> lib/_emerge/Scheduler.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/_emerge/Scheduler.py b/lib/_emerge/Scheduler.py index 2d1872feba..c7e465731a 100644 --- a/lib/_emerge/Scheduler.py +++ b/lib/_emerge/Scheduler.py @@ -1259,8 +1259,13 @@ class Scheduler(PollScheduler): and self._failed_pkgs_die_msgs and not mod_echo_output ): + failed_pkg_map = {} + for pkg in self._failed_pkgs_all: + failed_pkg_map[(pkg.cpv, pkg.root)] = pkg + for mysettings, key, logentries in self._failed_pkgs_die_msgs: - color = "PKG_BINARY_MERGE" if pkg.built else "INFORM" + pkg = failed_pkg_map.get((key, mysettings["EROOT"])) + color = "PKG_BINARY_MERGE" if pkg and pkg.built else "INFORM" root_msg = "" if mysettings["ROOT"] != "/":
