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 6F09A158170 for ; Fri, 19 Jul 2024 05:41:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8956AE2A4C; Fri, 19 Jul 2024 05:41:38 +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 6B804E2A4C for ; Fri, 19 Jul 2024 05:41:38 +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 3CBEE342FA1 for ; Fri, 19 Jul 2024 05:41:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7754B1E44 for ; Fri, 19 Jul 2024 05:41:35 +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: <1721367689.b65da90fe378b5aff48b0d11db376a26f4ca3c90.sam@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: lib/_emerge/, lib/portage/tests/update/, lib/portage/tests/resolver/, ... X-VCS-Repository: proj/portage X-VCS-Files: lib/_emerge/BinpkgFetcher.py lib/_emerge/BinpkgVerifier.py lib/portage/gpkg.py lib/portage/tests/resolver/test_runtime_cycle_merge_order.py lib/portage/tests/update/test_move_ent.py X-VCS-Directories: lib/portage/ lib/_emerge/ lib/portage/tests/resolver/ lib/portage/tests/update/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: b65da90fe378b5aff48b0d11db376a26f4ca3c90 X-VCS-Branch: master Date: Fri, 19 Jul 2024 05:41:35 +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: fc564bba-2129-49e1-88c4-9d3e2c1be214 X-Archives-Hash: 68d67df8fe8e2bd5c9b9cde3c903ddce commit: b65da90fe378b5aff48b0d11db376a26f4ca3c90 Author: Markus Meier gentoo org> AuthorDate: Wed Jul 3 13:19:16 2024 +0000 Commit: Sam James gentoo org> CommitDate: Fri Jul 19 05:41:29 2024 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=b65da90f convert f-strings to normal strings that do not contain any {}. detected with ruff Signed-off-by: Markus Meier gentoo.org> Closes: https://github.com/gentoo/portage/pull/1355 Signed-off-by: Sam James gentoo.org> lib/_emerge/BinpkgFetcher.py | 2 +- lib/_emerge/BinpkgVerifier.py | 2 +- lib/portage/gpkg.py | 4 ++-- lib/portage/tests/resolver/test_runtime_cycle_merge_order.py | 4 ++-- lib/portage/tests/update/test_move_ent.py | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/_emerge/BinpkgFetcher.py b/lib/_emerge/BinpkgFetcher.py index a357bac82d..bb6997536b 100644 --- a/lib/_emerge/BinpkgFetcher.py +++ b/lib/_emerge/BinpkgFetcher.py @@ -30,7 +30,7 @@ class BinpkgFetcher(CompositeTask): binpkg_path = bintree._remotepkgs[instance_key].get("PATH") if not binpkg_path: raise FileNotFound( - f"PATH not found in the binpkg index, the binhost's portage is probably out of date." + "PATH not found in the binpkg index, the binhost's portage is probably out of date." ) binpkg_format = get_binpkg_format(binpkg_path) diff --git a/lib/_emerge/BinpkgVerifier.py b/lib/_emerge/BinpkgVerifier.py index 7e044c6c43..dd3a70d3ae 100644 --- a/lib/_emerge/BinpkgVerifier.py +++ b/lib/_emerge/BinpkgVerifier.py @@ -47,7 +47,7 @@ class BinpkgVerifier(CompositeTask): if bintree.dbapi.cpv_exists(self.pkg.cpv): self.scheduler.output( f"!!! Tried to use non-existent binary for '{self.pkg.cpv}'\n" - + f"!!! Likely caused by an outdated index. Run 'emaint binhost -f'.\n", + + "!!! Likely caused by an outdated index. Run 'emaint binhost -f'.\n", log_path=self.logfile, background=self.background, ) diff --git a/lib/portage/gpkg.py b/lib/portage/gpkg.py index fdb54c69b8..06e2283ce1 100644 --- a/lib/portage/gpkg.py +++ b/lib/portage/gpkg.py @@ -384,7 +384,7 @@ class tar_stream_reader: try: if self.proc.wait() != os.EX_OK: if not self.killed: - writemsg(colorize("BAD", f"GPKG external program failed.\n")) + writemsg(colorize("BAD", "GPKG external program failed.\n")) raise CompressorOperationFailed("decompression failed") finally: self.proc.stdout.close() @@ -2120,7 +2120,7 @@ class gpkg: return the first one. """ if self.gpkg_version not in (os.path.basename(f) for f in tar.getnames()): - raise InvalidBinaryPackageFormat(f"Invalid gpkg file") + raise InvalidBinaryPackageFormat("Invalid gpkg file") if self.basename and self.prefix and not self.prefix.startswith(self.basename): writemsg( diff --git a/lib/portage/tests/resolver/test_runtime_cycle_merge_order.py b/lib/portage/tests/resolver/test_runtime_cycle_merge_order.py index a695b25198..fb1c52f0ea 100644 --- a/lib/portage/tests/resolver/test_runtime_cycle_merge_order.py +++ b/lib/portage/tests/resolver/test_runtime_cycle_merge_order.py @@ -204,8 +204,8 @@ class RuntimeCycleMergeOrderTestCase(TestCase): debug=False, user_config={ "make.conf": ( - f'ACCEPT_KEYWORDS="~x86"', - f'USE="http2"', + 'ACCEPT_KEYWORDS="~x86"', + 'USE="http2"', ), }, ) diff --git a/lib/portage/tests/update/test_move_ent.py b/lib/portage/tests/update/test_move_ent.py index 0b938dd287..99e725e1c6 100644 --- a/lib/portage/tests/update/test_move_ent.py +++ b/lib/portage/tests/update/test_move_ent.py @@ -287,7 +287,7 @@ class MoveEntTestCase(TestCase): user_config={ "make.conf": ( f'BINPKG_FORMAT="{binpkg_format}"', - f'FEATURES="binpkg-multi-instance pkgdir-index-trusted"', + 'FEATURES="binpkg-multi-instance pkgdir-index-trusted"', ), }, debug=False,