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 AAB8115808A for ; Tue, 22 Jul 2025 22:28:45 +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 8FCCB340F79 for ; Tue, 22 Jul 2025 22:28:45 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 8148311055E; Tue, 22 Jul 2025 22:28:44 +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) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 7680011055E for ; Tue, 22 Jul 2025 22:28:44 +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 2FDDF340F79 for ; Tue, 22 Jul 2025 22:28:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C7262327B for ; Tue, 22 Jul 2025 22:28:42 +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: <1753223318.929567bd3d085f454070f33cbac29d2cfc747f74.sam@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/save-ebuild-env.sh X-VCS-Directories: bin/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 929567bd3d085f454070f33cbac29d2cfc747f74 X-VCS-Branch: master Date: Tue, 22 Jul 2025 22:28:42 +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: 45de0a53-26c6-4c9d-90c0-a7757731128a X-Archives-Hash: fb4020ca05170779ff5a74bf1d099bfc commit: 929567bd3d085f454070f33cbac29d2cfc747f74 Author: Kerin Millar plushkava net> AuthorDate: Tue Jul 15 00:39:58 2025 +0000 Commit: Sam James gentoo org> CommitDate: Tue Jul 22 22:28:38 2025 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=929567bd save-ebuild-env.sh: filter out the contains_word() function The contains_word() function was added to the "isolated-functions.sh" unit by the referenced commit. Ensure that it is filtered out by the __save_ebuild_env() function. See-also: 4a4631eef7186c29668a8c049d988b61469940fd Signed-off-by: Kerin Millar plushkava.net> Signed-off-by: Sam James gentoo.org> bin/save-ebuild-env.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/bin/save-ebuild-env.sh b/bin/save-ebuild-env.sh index 233e4b6e85..0050f3d0de 100644 --- a/bin/save-ebuild-env.sh +++ b/bin/save-ebuild-env.sh @@ -97,12 +97,13 @@ __save_ebuild_env() ( __unpack_tar __vecho addpredict addwrite adddeny addread assert best_version - debug-print-function debug-print-section debug-print docompress - default diropts docinto dostrip die einstall eqawarn exeinto - exeopts ebegin eerror einfon econf einfo ewarn eend elog get_KV - has_version hasq hasv has inherit insinto insopts into libopts - nonfatal portageq register_success_hook register_die_hook - use_enable use_with unpack useq usev use + contains_word debug-print-function debug-print-section + debug-print docompress default diropts docinto dostrip die + einstall eqawarn exeinto exeopts ebegin eerror einfon econf + einfo ewarn eend elog get_KV has_version hasq hasv has inherit + insinto insopts into libopts nonfatal portageq + register_success_hook register_die_hook use_enable use_with + unpack useq usev use # Defined by the "ebuild.sh" utility. ${QA_INTERCEPTORS}