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 9690815806C for ; Sun, 13 Jul 2025 04:20:13 +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 7D5D3341F1D for ; Sun, 13 Jul 2025 04:20:13 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 051AD110564; Sun, 13 Jul 2025 04:19:54 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 E98BD110561 for ; Sun, 13 Jul 2025 04:19:53 +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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9D33F341EFF for ; Sun, 13 Jul 2025 04:19:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 734E630EF for ; Sun, 13 Jul 2025 04:19:51 +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: <1752380345.e89c41e3925f60c88e04d5a2798722ee476fdf03.sam@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/phase-functions.sh X-VCS-Directories: bin/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: e89c41e3925f60c88e04d5a2798722ee476fdf03 X-VCS-Branch: master Date: Sun, 13 Jul 2025 04:19:51 +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: 68532481-4edd-436b-8001-4eed0c40d4c3 X-Archives-Hash: 5d1a611feab8ec90ecd61abf6d5d5f4a commit: e89c41e3925f60c88e04d5a2798722ee476fdf03 Author: Kerin Millar plushkava net> AuthorDate: Tue Jul 8 23:24:56 2025 +0000 Commit: Sam James gentoo org> CommitDate: Sun Jul 13 04:19:05 2025 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=e89c41e3 phase-functions.sh: improve the comment describing --allow-extra-vars behaviour Presently, the "phase-functions.sh" unit contains a comment describing the effect of the --allow-extra-vars option, as it pertains to the __filter_readonly_variables() function. This comment contains two typographical errors and does not properly describe the behaviour of the option. Rectify these shortcomings. Signed-off-by: Kerin Millar plushkava.net> Signed-off-by: Sam James gentoo.org> bin/phase-functions.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh index afe28c613f..58904cd80e 100644 --- a/bin/phase-functions.sh +++ b/bin/phase-functions.sh @@ -76,10 +76,13 @@ PORTAGE_MUTABLE_FILTERED_VARS="AA HOSTNAME" # However, old settings should be overridden when loading the # environment from a binary or installed package. # -# ---allow-extra-vars causes some extra vars to be allowd through, such -# as ${PORTAGE_SAVED_READONLY_VARS} and ${PORTAGE_MUTABLE_FILTERED_VARS}. -# This is enabled automatically if EMERGE_FROM=binary, since it preserves -# variables from when the package was originally built. +# --allow-extra-vars inhibits the filtering of the variables whose names are +# specified by the PORTAGE_SAVED_READONLY_VARS and PORTAGE_MUTABLE_FILTERED_VARS +# variables. However, in the absence of the option, only the CATEGORY, P, PF, +# PN, PR, PV and PVR variables shall be filtered, provided that the value of +# EMERGE_FROM is equal to "binary". The reason for this exception in behaviour +# is to preserve various variables as they were at the time that the binary +# package was built while protecting against the application of package renames. __filter_readonly_variables() { local -a {binpkg_untrusted,filtered_sandbox,misc_garbage,bash}_vars words local IFS