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 31F231580EB for ; Fri, 30 May 2025 07:36:44 +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 1E0983430AC for ; Fri, 30 May 2025 07:36:44 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 6938C110497; Fri, 30 May 2025 07:36:37 +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 62999110497 for ; Fri, 30 May 2025 07:36:37 +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 18BF2343053 for ; Fri, 30 May 2025 07:36:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7FD5D28E3 for ; Fri, 30 May 2025 07:36:35 +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: <1748590554.59b81ecda599e9fbf4084e4595f1fa96c32a9fc1.sam@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/install-qa-check.d/ X-VCS-Repository: proj/portage X-VCS-Files: bin/install-qa-check.d/80multilib-strict X-VCS-Directories: bin/install-qa-check.d/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 59b81ecda599e9fbf4084e4595f1fa96c32a9fc1 X-VCS-Branch: master Date: Fri, 30 May 2025 07:36:35 +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: 128c9c1e-8c08-4ecc-8af5-e4f814954588 X-Archives-Hash: 781034dee294469aa84eb3551aaf56a6 commit: 59b81ecda599e9fbf4084e4595f1fa96c32a9fc1 Author: Kerin Millar plushkava net> AuthorDate: Sun Aug 7 19:40:37 2022 +0000 Commit: Sam James gentoo org> CommitDate: Fri May 30 07:35:54 2025 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=59b81ecd 80multilib-strict: use read to split QA_MULTILIB_PATHS Rather than employ the combination of noglob and unquoted expansions to convert QA_MULTILIB_PATHS to an array, have read handle it instead. This addresses an instance of SC2086 which, owing to a recent commit in which I localised IFS, no longer constitutes a legitimate bug. Still, I elected to employ read because I do not trust other portage contributors not to repeat the same mistake in the future. Consider it a case of leading by example, if you will. Further, check whether QA_MULTILIB_PATHS is an array by examining its attributes. This requires bash-4.4 at the minimum. I discussed the matter with Sam James prior and he consented to the use of its features. Signed-off-by: Kerin Millar plushkava.net> Signed-off-by: Sam James gentoo.org> bin/install-qa-check.d/80multilib-strict | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/bin/install-qa-check.d/80multilib-strict b/bin/install-qa-check.d/80multilib-strict index 9b687961b4..f88c2d22b7 100644 --- a/bin/install-qa-check.d/80multilib-strict +++ b/bin/install-qa-check.d/80multilib-strict @@ -17,12 +17,8 @@ multilib_strict_check() { done if [[ -s ${T}/multilib-strict.log ]] ; then - if [[ ${#QA_MULTILIB_PATHS[@]} -eq 1 ]] ; then - local shopts=$- - set -o noglob - QA_MULTILIB_PATHS=(${QA_MULTILIB_PATHS}) - set +o noglob - set -${shopts} + if [[ ${QA_MULTILIB_PATHS@a} != *a* ]] ; then + read -rd '' -a QA_MULTILIB_PATHS <<<"${QA_MULTILIB_PATHS}" fi if [ "${QA_STRICT_MULTILIB_PATHS-unset}" = unset ] ; then for dir in "${QA_MULTILIB_PATHS[@]}" ; do