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 0208115808A for ; Tue, 22 Jul 2025 22:31:34 +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 78B2B341EA6 for ; Tue, 22 Jul 2025 22:30:11 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 3A99B110563; Tue, 22 Jul 2025 22:30:01 +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 35011110563 for ; Tue, 22 Jul 2025 22:30: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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E9229340EF5 for ; Tue, 22 Jul 2025 22:30:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 74A80329C for ; Tue, 22 Jul 2025 22:29: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: <1753223376.3eeff52eda750df5fc75b5e9b460a3786c968c7c.sam@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/phase-helpers.sh X-VCS-Directories: bin/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 3eeff52eda750df5fc75b5e9b460a3786c968c7c X-VCS-Branch: master Date: Tue, 22 Jul 2025 22:29: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: 8bddb56b-991b-4126-ad2e-3821fb287455 X-Archives-Hash: c478f227d7c1deee75835aa2134f152d commit: 3eeff52eda750df5fc75b5e9b460a3786c968c7c Author: Kerin Millar plushkava net> AuthorDate: Fri Jul 18 19:14:01 2025 +0000 Commit: Sam James gentoo org> CommitDate: Tue Jul 22 22:29:36 2025 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=3eeff52e phase-helpers.sh: rename _eapply_patch() to __eapply_patch() Presently, the "phase-helpers.sh" unit defines the _eapply_patch() helper function, provided that the targeted EAPI is confirmed to support eapply(). Unlike other functions that portage declares as ostensibly being for internal use, its name contains only a single leading , rendering it an outlier. Rename the function so that its name contains two leading characters. Signed-off-by: Kerin Millar plushkava.net> Signed-off-by: Sam James gentoo.org> bin/phase-helpers.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh index f01ef09467..89f1f6f2f8 100644 --- a/bin/phase-helpers.sh +++ b/bin/phase-helpers.sh @@ -981,7 +981,7 @@ if ___eapi_has_eapply; then patch() { gpatch "$@"; } fi - _eapply_patch() { + __eapply_patch() { local prefix=$1 patch=$2 output IFS shift 2 @@ -1041,14 +1041,14 @@ if ___eapi_has_eapply; then if (( i++ == 0 )); then einfo "Applying patches from ${path} ..." fi - _eapply_patch ' ' "${f}" "${options[@]}" || return + __eapply_patch ' ' "${f}" "${options[@]}" || return fi done if (( i == 0 )); then die "No *.{patch,diff} files in directory ${path}" fi else - _eapply_patch '' "${path}" "${options[@]}" || return + __eapply_patch '' "${path}" "${options[@]}" || return fi done }