diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2023-10-20 18:31:44 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2023-10-21 21:36:43 -0700 |
| commit | 935d1432b2ea42fc0a49b9e3368a1766a673e1a9 (patch) | |
| tree | 0c2c7dcb0f33edc496acc15cbaeedae70a317670 | |
| parent | ForkProcess: Implement fd_pipes via send_handle (diff) | |
| download | portage-935d1432b2ea42fc0a49b9e3368a1766a673e1a9.tar.gz portage-935d1432b2ea42fc0a49b9e3368a1766a673e1a9.tar.bz2 portage-935d1432b2ea42fc0a49b9e3368a1766a673e1a9.zip | |
_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@gentoo.org>
| -rw-r--r-- | lib/_emerge/Scheduler.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/_emerge/Scheduler.py b/lib/_emerge/Scheduler.py index 2d1872feb..c7e465731 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"] != "/": |