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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F2EC615800F for ; Sat, 18 Feb 2023 00:00:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8CB1BE07C7; Sat, 18 Feb 2023 00:00:21 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 6F392E07C7 for ; Sat, 18 Feb 2023 00:00:21 +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 5EBAD340ED8 for ; Sat, 18 Feb 2023 00:00:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A90688AE for ; Sat, 18 Feb 2023 00:00:18 +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: <1676678412.0f075baba8e3accc124c9c599c90603e17cdf6a5.sam@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: lib/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: lib/_emerge/PackageMerge.py X-VCS-Directories: lib/_emerge/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 0f075baba8e3accc124c9c599c90603e17cdf6a5 X-VCS-Branch: master Date: Sat, 18 Feb 2023 00:00:18 +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: cbdf90e8-04da-4f9b-ba5f-07466b05fc76 X-Archives-Hash: 6c689dedd032a5e0bdf1a45d9e1da6b1 commit: 0f075baba8e3accc124c9c599c90603e17cdf6a5 Author: Benjamin Gordon chromium org> AuthorDate: Tue Feb 4 18:40:13 2020 +0000 Commit: Sam James gentoo org> CommitDate: Sat Feb 18 00:00:12 2023 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=0f075bab emerge: Factor out two functions Will be used in the next commit. Reviewed-by: Mike Frysinger chromium.org> Reviewed-by: Chris McDonald chromium.org> Signed-off-by: Benjamin Gordon chromium.org> Signed-off-by: Matt Turner gentoo.org> Signed-off-by: Sam James gentoo.org> lib/_emerge/PackageMerge.py | 42 +++++++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/lib/_emerge/PackageMerge.py b/lib/_emerge/PackageMerge.py index 8272511a1..f9e6bf8fe 100644 --- a/lib/_emerge/PackageMerge.py +++ b/lib/_emerge/PackageMerge.py @@ -9,13 +9,33 @@ from portage.output import colorize class PackageMerge(CompositeTask): __slots__ = ("merge", "postinst_failure") + def _should_show_status(self): + return ( + not self.merge.build_opts.fetchonly + and not self.merge.build_opts.pretend + and not self.merge.build_opts.buildpkgonly + ) + + def _make_msg(self, pkg, action_desc, preposition, counter_str): + pkg_color = "PKG_MERGE" + if pkg.type_name == "binary": + pkg_color = "PKG_BINARY_MERGE" + + msg = "{} {}{}".format( + action_desc, + counter_str, + colorize(pkg_color, pkg.cpv + _repo_separator + pkg.repo), + ) + + if pkg.root_config.settings["ROOT"] != "/": + msg += f" {preposition} {pkg.root}" + + return msg + def _start(self): self.scheduler = self.merge.scheduler pkg = self.merge.pkg pkg_count = self.merge.pkg_count - pkg_color = "PKG_MERGE" - if pkg.type_name == "binary": - pkg_color = "PKG_BINARY_MERGE" if pkg.installed: action_desc = "Uninstalling" @@ -29,20 +49,8 @@ class PackageMerge(CompositeTask): colorize("MERGE_LIST_PROGRESS", str(pkg_count.maxval)), ) - msg = "{} {}{}".format( - action_desc, - counter_str, - colorize(pkg_color, pkg.cpv + _repo_separator + pkg.repo), - ) - - if pkg.root_config.settings["ROOT"] != "/": - msg += f" {preposition} {pkg.root}" - - if ( - not self.merge.build_opts.fetchonly - and not self.merge.build_opts.pretend - and not self.merge.build_opts.buildpkgonly - ): + if self._should_show_status(): + msg = self._make_msg(pkg, action_desc, preposition, counter_str) self.merge.statusMessage(msg) task = self.merge.create_install_task()