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 7134215800A for ; Wed, 26 Jul 2023 07:58:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 960E4E093A; Wed, 26 Jul 2023 07:58:36 +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 79C50E093A for ; Wed, 26 Jul 2023 07:58:36 +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 777C7335D7F for ; Wed, 26 Jul 2023 07:58:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 13651DD4 for ; Wed, 26 Jul 2023 07:58:34 +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: <1690358311.a777662890a7552927ee794506a92ddffc43523e.sam@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/util/ X-VCS-Repository: proj/portage X-VCS-Files: lib/portage/util/env_update.py X-VCS-Directories: lib/portage/util/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: a777662890a7552927ee794506a92ddffc43523e X-VCS-Branch: master Date: Wed, 26 Jul 2023 07:58:34 +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: 8285748a-ad26-4d61-96f8-2bbd885dd008 X-Archives-Hash: 2ad7828f28d82fedee598a6ec0dba513 commit: a777662890a7552927ee794506a92ddffc43523e Author: Sam James gentoo org> AuthorDate: Tue Jul 25 03:19:14 2023 +0000 Commit: Sam James gentoo org> CommitDate: Wed Jul 26 07:58:31 2023 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=a7776628 lib: env_update: use more f-strings Signed-off-by: Sam James gentoo.org> lib/portage/util/env_update.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/portage/util/env_update.py b/lib/portage/util/env_update.py index a7015669e..9d3b5bb25 100644 --- a/lib/portage/util/env_update.py +++ b/lib/portage/util/env_update.py @@ -361,19 +361,17 @@ def _env_update(makelinks, target_root, prev_mtimes, contents, env, writemsg_lev # an older package installed ON TOP of a newer version will cause ldconfig # to overwrite the symlinks we just made. -X means no links. After 'clean' # we can safely create links. - writemsg_level( - _(">>> Regenerating %setc/ld.so.cache...\n") % (target_root,) - ) + writemsg_level(_(f">>> Regenerating {target_root}etc/ld.so.cache...\n")) ret = subprocess.run( - [f"{ldconfig}", "-X", "-r", f"{target_root}"], cwd="/" + [ldconfig, "-X", "-r", target_root], cwd="/" ).returncode elif ostype in ("FreeBSD", "DragonFly"): writemsg_level( - _(">>> Regenerating %svar/run/ld-elf.so.hints...\n") % target_root + _(f">>> Regenerating {target_root}var/run/ld-elf.so.hints...\n") ) ret = subprocess.run( [ - f"{ldconfig}", + ldconfig, "-elf", "-i", "-f",