[patch] hack.patch

file_914159.txt (text/plain), 1.41 KB, created by Sam James on 2023-09-14 07:27:03 UTC

$ git diff
diff --git a/lib/_emerge/Scheduler.py b/lib/_emerge/Scheduler.py
index ece3f27f7..2ab35875f 100644
--- a/lib/_emerge/Scheduler.py
+++ b/lib/_emerge/Scheduler.py
@@ -865,13 +865,15 @@ class Scheduler(PollScheduler):
             if self._terminated_tasks:
                 raise asyncio.CancelledError
 
-            out_str = "Running pre-merge checks for " + colorize("INFORM", x.cpv)
-            self._status_msg(out_str)
-
             root_config = x.root_config
             settings = self._allocate_config(root_config.root)
             settings.setcpv(x)
-            if not x.built:
+
+            if x.built:
+                out_str = "Running pre-merge checks for " + colorize("PKG_BINARY_MERGE", x.cpv)
+            else:
+                out_str = "Running pre-merge checks for " + colorize("INFORM", x.cpv)
+
                 # Get required SRC_URI metadata (it's not cached in x.metadata
                 # because some packages have an extremely large SRC_URI value).
                 portdb = root_config.trees["porttree"].dbapi
@@ -879,6 +881,8 @@ class Scheduler(PollScheduler):
                     x.cpv, ["SRC_URI"], myrepo=x.repo, loop=loop
                 )
 
+            self._status_msg(out_str)
+
             # setcpv/package.env allows for per-package PORTAGE_TMPDIR so we
             # have to validate it for each package
             rval = _check_temp_dir(settings)