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 1E28B15ACFC for ; Mon, 1 May 2023 07:22:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 57139E0844; Mon, 1 May 2023 07:22:01 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 3BC50E0844 for ; Mon, 1 May 2023 07:22:01 +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 629C8341489 for ; Mon, 1 May 2023 07:22:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AD2C6A5A for ; Mon, 1 May 2023 07:21:58 +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: <1682925657.865860503c1279a1b5880aa180ecf67206640e45.sam@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: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 865860503c1279a1b5880aa180ecf67206640e45 X-VCS-Branch: master Date: Mon, 1 May 2023 07:21:58 +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: d4e13d85-bce9-4942-9d0a-01bd87bb214f X-Archives-Hash: 6312304b46138f1275828cae03ecc410 commit: 865860503c1279a1b5880aa180ecf67206640e45 Author: Sam James gentoo org> AuthorDate: Sun Apr 30 05:28:55 2023 +0000 Commit: Sam James gentoo org> CommitDate: Mon May 1 07:20:57 2023 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=86586050 sync: webrsync: export PORTAGE_GPG_KEY for emerge-webrsync Set PORTAGE_GPG_KEY to sync-openpgp-key-path configured by the user for use by emerge-webrsync to pass to gemato. Bug: https://bugs.gentoo.org/905358 Signed-off-by: Sam James gentoo.org> lib/portage/sync/modules/webrsync/webrsync.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/portage/sync/modules/webrsync/webrsync.py b/lib/portage/sync/modules/webrsync/webrsync.py index b4a6bb4f8..8de7c08ad 100644 --- a/lib/portage/sync/modules/webrsync/webrsync.py +++ b/lib/portage/sync/modules/webrsync/webrsync.py @@ -109,6 +109,9 @@ class WebRsync(SyncBase): self._refresh_keys(openpgp_env) self.spawn_kwargs["env"]["PORTAGE_GPG_DIR"] = openpgp_env.home self.spawn_kwargs["env"]["PORTAGE_TEMP_GPG_DIR"] = openpgp_env.home + self.spawn_kwargs["env"][ + "PORTAGE_GPG_KEY" + ] = self.repo.sync_openpgp_key_path except (GematoException, asyncio.TimeoutError) as e: writemsg_level( f"!!! Verification impossible due to keyring problem:\n{e}\n",