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 3D86A158074 for ; Thu, 19 Jun 2025 18:13:49 +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 EC624341F2E for ; Thu, 19 Jun 2025 18:13:48 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id B6DCC1104D9; Thu, 19 Jun 2025 18:13:47 +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 bobolink.gentoo.org (Postfix) with ESMTPS id AA9E11104D9 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 54883341F2E 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 C9C4029FA for ; Thu, 19 Jun 2025 18:13:45 +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: <1750356789.93c443002a755862b3f4aae2f3066578734f45ca.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: 93c443002a755862b3f4aae2f3066578734f45ca X-VCS-Branch: master Date: Thu, 19 Jun 2025 18:13:45 +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: 05eb4b76-d3a7-4a84-b900-a2b058f3e065 X-Archives-Hash: 071781e727be71cf9254689325434a24 commit: 93c443002a755862b3f4aae2f3066578734f45ca Author: Kerin Millar plushkava net> AuthorDate: Thu Jun 19 00:54:22 2025 +0000 Commit: Sam James gentoo org> CommitDate: Thu Jun 19 18:13:09 2025 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=93c44300 emerge-webrsync: don't always abort because PORTAGE_GPG_DIR is empty/unset A recent commit improved upon the way in which the fallback path from gemato to gpg(1) is implemented. However, it also made it impossible to use emerge-webrsync in the case that all these conditions hold true: - PGP verification hasn't been disabled - the 'FEATURES' variable doesn't contain "webrsync-gpg" - gemato cannot be found in 'PATH' - the 'PORTAGE_GPG_DIR' variable is unset or empty The symptom of this regression is depicted below. * app-portage/gemato does not appear to be installed. Falling back to gpg. * PGP verification method: legacy gpg emerge-webrsync: Please set PORTAGE_GPG_DIR in make.conf! Rectify this defect by re-positioning the test for whether the 'PORTAGE_GPG_DIR' variable is empty, thereby ensuring that it is only conducted if the 'FEATURES' variable is found to contain "webrsync-gpg". Also, revise the diagnostic message so as to be more formal and matter-of-fact in tone. Fixes: b54fced4a5a8310bc65972de5b284b249c61315b Signed-off-by: Kerin Millar plushkava.net> Signed-off-by: Sam James gentoo.org> bin/emerge-webrsync | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync index c5c16eaf81..22df8ce635 100755 --- a/bin/emerge-webrsync +++ b/bin/emerge-webrsync @@ -119,6 +119,9 @@ handle_pgp_setup() { # Discourage the use of the deprecated "webrsync-gpg" feature # because it prevents the use of gemato for verification. ewarn "FEATURES=webrsync-gpg is deprecated, see the make.conf(5) man page." + if [[ ! ${PORTAGE_GPG_DIR} ]]; then + die "PORTAGE_GPG_DIR is unset or empty (the webrsync-gpg feature requires that it be set)" + fi WEBRSYNC_VERIFY_SIGNATURE=2 elif ! type -P gemato > /dev/null; then # Fall back to conventional verification with gpg(1). @@ -149,9 +152,6 @@ handle_pgp_setup() { PORTAGE_GPG_DIR=${PORTAGE_TEMP_GPG_DIR} fi - if [[ ${WEBRSYNC_VERIFY_SIGNATURE} == 2 && -z "${PORTAGE_GPG_DIR}" ]]; then - die "Please set PORTAGE_GPG_DIR in make.conf!" - fi } do_tar() {