From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 finch.gentoo.org (Postfix) with ESMTPS id 1686E158074 for ; Thu, 19 Jun 2025 18:13:57 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 0259C341F1B for ; Thu, 19 Jun 2025 18:13:57 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 00D251104E2; Thu, 19 Jun 2025 18:13:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id EA7271104E2 for ; Thu, 19 Jun 2025 18:13:47 +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 9F95A341F38 for ; Thu, 19 Jun 2025 18:13:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 180772A0B for ; Thu, 19 Jun 2025 18:13:46 +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: <1750356791.5f758d2fe319ae59c3e8b33b797936714975f1f1.sam@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/emerge-webrsync X-VCS-Directories: bin/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 5f758d2fe319ae59c3e8b33b797936714975f1f1 X-VCS-Branch: master Date: Thu, 19 Jun 2025 18:13:46 +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: 6aff18a4-0af2-4b9d-b9ef-8c0778ae5aba X-Archives-Hash: 22193b65761d999dccb7354c4509c918 commit: 5f758d2fe319ae59c3e8b33b797936714975f1f1 Author: Kerin Millar plushkava net> AuthorDate: Thu Jun 19 03:01:18 2025 +0000 Commit: Sam James gentoo org> CommitDate: Thu Jun 19 18:13:11 2025 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=5f758d2f emerge-webrsync: comment as to the provenance of PORTAGE_GPG_KEY{,_SERVER} Add some comments explaining that both the 'PORTAGE_GPG_KEY' and 'PORTAGE_GPG_KEY_SERVER' environment variables are defined by the webrsync module. See-also: 865860503c1279a1b5880aa180ecf67206640e45 See-also: e1f8478c666de6c2310381457e846b4fe8fa8b39 Signed-off-by: Kerin Millar plushkava.net> Signed-off-by: Sam James gentoo.org> bin/emerge-webrsync | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync index 005548cf90..17e46767ca 100755 --- a/bin/emerge-webrsync +++ b/bin/emerge-webrsync @@ -273,7 +273,10 @@ check_file_signature_gemato() { ) fi - [[ -n ${PORTAGE_GPG_KEY_SERVER} ]] && gemato_args+=( --keyserver "${PORTAGE_GPG_KEY_SERVER}" ) + # PORTAGE_GPG_KEY_SERVER is directly exported by the webrsync module. + if [[ ${PORTAGE_GPG_KEY_SERVER} ]]; then + gemato_args+=( --keyserver "${PORTAGE_GPG_KEY_SERVER}" ) + fi (( opt[quiet] )) && gemato_args+=( --quiet ) (( opt[debug] )) && gemato_args+=( --debug ) @@ -309,6 +312,7 @@ check_file_signature_gpg() { } assign_key() { + # PORTAGE_GPG_KEY is directly exported by the webrsync module. if [[ ${PORTAGE_GPG_KEY} ]]; then key=${PORTAGE_GPG_KEY} else