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 A90151580E0 for ; Sun, 01 Jun 2025 21:47: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 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 4C2163430B6 for ; Sun, 01 Jun 2025 21:47:57 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 3961D110497; Sun, 01 Jun 2025 21:47:45 +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)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 3217A110497 for ; Sun, 01 Jun 2025 21:47:45 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E34CD3430A7 for ; Sun, 01 Jun 2025 21:47:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EC17528EF for ; Sun, 01 Jun 2025 21:47: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: <1748814123.485a3ff72b300594b01f81a871059746a236e6ba.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: 485a3ff72b300594b01f81a871059746a236e6ba X-VCS-Branch: master Date: Sun, 01 Jun 2025 21:47: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: 76a42516-9f65-4056-80b9-6f8301aa02a0 X-Archives-Hash: e845d857450d582f9861166f412c8399 commit: 485a3ff72b300594b01f81a871059746a236e6ba Author: Kerin Millar plushkava net> AuthorDate: Sun Jun 1 02:52:53 2025 +0000 Commit: Sam James gentoo org> CommitDate: Sun Jun 1 21:42:03 2025 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=485a3ff7 Eliminate all remaining uses of ___is_indexed_array_var() Adjust the following three functions so as to use the ${param@a} form of expansion in the course of determining whether a given variable is an indexed array. __eapi4_src_install __eapi6_src_prepare __eapi8_src_prepare Doing so is acceptable, given a target of >=bash-4.4. 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 b07bb42b3c..2aa84b0a9a 100644 --- a/bin/phase-helpers.sh +++ b/bin/phase-helpers.sh @@ -792,7 +792,7 @@ __eapi4_src_install() { THANKS BUGS FAQ CREDITS CHANGELOG ; do [[ -s "${d}" ]] && dodoc "${d}" done - elif ___is_indexed_array_var DOCS ; then + elif [[ ${DOCS@a} == *a* ]] ; then dodoc "${DOCS[@]}" else dodoc ${DOCS} @@ -800,7 +800,7 @@ __eapi4_src_install() { } __eapi6_src_prepare() { - if ___is_indexed_array_var PATCHES ; then + if [[ ${PATCHES@a} == *a* ]] ; then [[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}" elif [[ -n ${PATCHES} ]]; then eapply ${PATCHES} @@ -819,7 +819,7 @@ __eapi6_src_install() { __eapi8_src_prepare() { local f - if ___is_indexed_array_var PATCHES ; then + if [[ ${PATCHES@a} == *a* ]] ; then [[ ${#PATCHES[@]} -gt 0 ]] && eapply -- "${PATCHES[@]}" elif [[ -n ${PATCHES} ]]; then eapply -- ${PATCHES}