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 (4096 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DFB07158232 for ; Sat, 7 Dec 2024 01:08:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DF7F8E096D; Sat, 7 Dec 2024 01:08: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 AAE9AE096D for ; Sat, 7 Dec 2024 01:08:37 +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 71A3234072E for ; Sat, 7 Dec 2024 01:08:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9FDC0AED for ; Sat, 7 Dec 2024 01:08:34 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1733532370.b39f9f819c34a7a67f2639acb4d4c17a1aa5df89.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/sync/modules/webrsync/ X-VCS-Repository: proj/portage X-VCS-Files: lib/portage/sync/modules/webrsync/webrsync.py X-VCS-Directories: lib/portage/sync/modules/webrsync/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: b39f9f819c34a7a67f2639acb4d4c17a1aa5df89 X-VCS-Branch: master Date: Sat, 7 Dec 2024 01:08: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: a7f36a51-2930-4dae-975f-dcaada5ccfd8 X-Archives-Hash: cc571797715fa4519a5e9e8e2fe080cb commit: b39f9f819c34a7a67f2639acb4d4c17a1aa5df89 Author: Leo Douglas gmail com> AuthorDate: Fri Dec 6 22:08:01 2024 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Dec 7 00:46:10 2024 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=b39f9f81 webrsync: Support sync-webrsync-verify-signature = false Bug: https://bugs.gentoo.org/945861 Signed-off-by: Zac Medico gentoo.org> lib/portage/sync/modules/webrsync/webrsync.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/portage/sync/modules/webrsync/webrsync.py b/lib/portage/sync/modules/webrsync/webrsync.py index ca0416fa48..4c3368f20b 100644 --- a/lib/portage/sync/modules/webrsync/webrsync.py +++ b/lib/portage/sync/modules/webrsync/webrsync.py @@ -68,6 +68,7 @@ class WebRsync(SyncBase): verbose = "--verbose" in self.options["emerge_config"].opts quiet = "--quiet" in self.options["emerge_config"].opts openpgp_env = None + webrsync_cmd = [self.bin_command] try: if self.repo.module_specific_options.get( "sync-webrsync-verify-signature", "false" @@ -104,8 +105,9 @@ class WebRsync(SyncBase): self.spawn_kwargs["env"][ "PORTAGE_GPG_KEY_SERVER" ] = self.repo.sync_openpgp_keyserver + else: + webrsync_cmd.append("--no-pgp-verify") - webrsync_cmd = [self.bin_command] if verbose: webrsync_cmd.append("-v") elif quiet: