commit: a3f0843a3256ffe3f1248b903702d5b58c7ac892
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 13 20:49:21 2026 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 13 20:50:39 2026 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=a3f0843a
Scheduler: fix error handling typo
Don't call _record_pkg_failure (and `continue` out of the loop iteration)
unconditionally. Also, while here, tidy up the `eerror` call so we always
do that if we don't have an `injected_package`.
Fixes: 14a21e6e4a6c5ef9ad9f84bae6b65fff5c00fdda
Signed-off-by: Sam James <sam <AT> gentoo.org>
lib/_emerge/Scheduler.py | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/lib/_emerge/Scheduler.py b/lib/_emerge/Scheduler.py
index 2b229587c3..f74c0e4589 100644
--- a/lib/_emerge/Scheduler.py
+++ b/lib/_emerge/Scheduler.py
@@ -1021,17 +1021,17 @@ class Scheduler(PollScheduler):
sys.stderr = stderr_orig
output_value = out.getvalue()
- if output_value:
- if injected_pkg is None:
- msg = ["Binary package is not usable:"]
+ if injected_pkg is None:
+ msg = ["Binary package is not usable:"]
+ if output_value:
msg.extend(
"\t" + line for line in
output_value.splitlines()
)
- self._elog("eerror", msg)
+ self._elog("eerror", msg)
- failures += 1
- self._record_pkg_failure(x, settings, 1)
- continue
+ failures += 1
+ self._record_pkg_failure(x, settings, 1)
+ continue
infloc = os.path.join(build_dir_path, "build-info")
ensure_dirs(infloc)
