From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 51FE3158089 for ; Fri, 15 Sep 2023 10:36:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 928E02BC028; Fri, 15 Sep 2023 10:36:53 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 70C912BC027 for ; Fri, 15 Sep 2023 10:36:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 93500335D17 for ; Fri, 15 Sep 2023 10:36:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CA7D111A7 for ; Fri, 15 Sep 2023 10:36:50 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1694774207.7280f1b3dc19ae1be1cc7a930346127b1b7e7686.sam@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: lib/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: lib/_emerge/Scheduler.py X-VCS-Directories: lib/_emerge/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 7280f1b3dc19ae1be1cc7a930346127b1b7e7686 X-VCS-Branch: master Date: Fri, 15 Sep 2023 10:36:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 839fd4a0-2b68-4968-ac4b-9298007edb6c X-Archives-Hash: 408945b0f9648c09424a390aad50f0de commit: 7280f1b3dc19ae1be1cc7a930346127b1b7e7686 Author: Sam James gentoo org> AuthorDate: Fri Sep 15 03:38:13 2023 +0000 Commit: Sam James gentoo org> CommitDate: Fri Sep 15 10:36:47 2023 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=7280f1b3 _emerge: use binpkg coloring for pkg_pretend For the 'Running pre-merge checks' message, we write: ``` >>> Running pre-merge checks for X ``` X is currently always in green, while the emerge list above might have the atom X listed in purple if it's a binpkg. Change X to be colored based on if it's a binpkg or not. Bug: https://bugs.gentoo.org/914159 Signed-off-by: Sam James gentoo.org> lib/_emerge/Scheduler.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/_emerge/Scheduler.py b/lib/_emerge/Scheduler.py index ece3f27f7c..db9615d406 100644 --- a/lib/_emerge/Scheduler.py +++ b/lib/_emerge/Scheduler.py @@ -865,12 +865,13 @@ 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) + + color = "PKG_BINARY_MERGE" if x.built else "INFORM" + self._status_msg(f"Running pre-merge checks for {colorize(color, x.cpv)}") + if not x.built: # Get required SRC_URI metadata (it's not cached in x.metadata # because some packages have an extremely large SRC_URI value).