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 E4CFD158021 for ; Sat, 3 Dec 2022 01:38:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1D42B2BC0DE; Sat, 3 Dec 2022 01:38:34 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 041D82BC0DE for ; Sat, 3 Dec 2022 01:38:34 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2120F341339 for ; Sat, 3 Dec 2022 01:38:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B1EF3771 for ; Sat, 3 Dec 2022 01:38:31 +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: <1670031503.a6737b229d62ad08a2f133c718d22f8701ae7ecb.sam@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/, lib/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: lib/_emerge/actions.py lib/_emerge/depgraph.py lib/portage/update.py X-VCS-Directories: lib/_emerge/ lib/portage/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: a6737b229d62ad08a2f133c718d22f8701ae7ecb X-VCS-Branch: master Date: Sat, 3 Dec 2022 01:38:31 +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: 375f58d7-830c-4e26-9942-905a24978428 X-Archives-Hash: 019744dddb6053a65e0df38b17d32eb9 commit: a6737b229d62ad08a2f133c718d22f8701ae7ecb Author: John Helmert III gentoo org> AuthorDate: Thu Dec 1 17:43:19 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sat Dec 3 01:38:23 2022 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=a6737b22 Manual string formatting updates Signed-off-by: John Helmert III gentoo.org> Closes: https://github.com/gentoo/portage/pull/888 Signed-off-by: Sam James gentoo.org> lib/_emerge/actions.py | 5 +++-- lib/_emerge/depgraph.py | 13 +++++++------ lib/portage/update.py | 4 ++-- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/lib/_emerge/actions.py b/lib/_emerge/actions.py index e93202b7f..30b687140 100644 --- a/lib/_emerge/actions.py +++ b/lib/_emerge/actions.py @@ -1651,8 +1651,9 @@ def _calc_depclean(settings, trees, ldpath_mtimes, myopts, action, args_set, spi if debug: writemsg_level( - "Candidates: [%s]\n" - % ", ".join("'{}'".format(x) for x in atoms), + "Candidates: [{}]\n".format( + ", ".join("'{}'".format(x) for x in atoms) + ), noiselevel=-1, level=logging.DEBUG, ) diff --git a/lib/_emerge/depgraph.py b/lib/_emerge/depgraph.py index 3b7c0d431..6b08f9fe2 100644 --- a/lib/_emerge/depgraph.py +++ b/lib/_emerge/depgraph.py @@ -2039,12 +2039,13 @@ class depgraph: "", "", "backtracking due to slot conflict:", - " first package: %s" % existing_node, - " package(s) to mask: %s" % str(to_be_masked), - " slot: %s" % slot_atom, - " parents: %s" - % ", ".join( - "({}, '{}')".format(ppkg, atom) for ppkg, atom in all_parents + " first package: {}".format(existing_node), + " package(s) to mask: {}".format(str(to_be_masked)), + " slot: {}".format(slot_atom), + " parents: {}".format( + ", ".join( + "({}, '{}')".format(ppkg, atom) for ppkg, atom in all_parents + ) ), "", ] diff --git a/lib/portage/update.py b/lib/portage/update.py index fdd0b1948..64dfad7e9 100644 --- a/lib/portage/update.py +++ b/lib/portage/update.py @@ -424,8 +424,8 @@ def update_config_files( if match_callback(repo_name, atom, new_atom): # add a comment with the update command, so # the user can clearly see what happened - contents[pos] = "# %s\n" % " ".join( - "{}".format(x) for x in update_cmd + contents[pos] = "# {}\n".format( + " ".join("{}".format(x) for x in update_cmd) ) contents.insert( pos + 1,