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 D32161580EB for ; Fri, 30 May 2025 08:14:46 +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 BF5EE3430A6 for ; Fri, 30 May 2025 08:14:46 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 826D51104A7; Fri, 30 May 2025 08:14:36 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 787DC1104A7 for ; Fri, 30 May 2025 08:14:36 +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 355B2343099 for ; Fri, 30 May 2025 08:14:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AA83128F1 for ; Fri, 30 May 2025 08:14:33 +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: <1748592861.49ef3c0f9a128c199ead699e371f27796590309f.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: 49ef3c0f9a128c199ead699e371f27796590309f X-VCS-Branch: master Date: Fri, 30 May 2025 08:14:33 +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: 2f8eea1b-4a4f-4992-93c9-ca93f2b4faf8 X-Archives-Hash: 43389367613af7b656b7fb114da273c9 commit: 49ef3c0f9a128c199ead699e371f27796590309f Author: Kerin Millar plushkava net> AuthorDate: Sat Jul 27 20:13:24 2024 +0000 Commit: Sam James gentoo org> CommitDate: Fri May 30 08:14:21 2025 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=49ef3c0f phase-helpers.sh: quote the expansions of DISTDIR in unpack() The value of DISTDIR must never be treated as the sub-pattern of an extended glob but, rather, as a literal string. Signed-off-by: Kerin Millar plushkava.net> Signed-off-by: Sam James gentoo.org> bin/phase-helpers.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh index da90cf3a5c..715c434ca6 100644 --- a/bin/phase-helpers.sh +++ b/bin/phase-helpers.sh @@ -366,10 +366,10 @@ unpack() { elif ___eapi_unpack_supports_absolute_paths; then # EAPI 6 allows absolute and deep relative paths srcdir= - if [[ ${f} == ${DISTDIR%/}/* ]]; then + if [[ ${f} == "${DISTDIR%/}"/* ]]; then eqawarn "QA Notice: unpack called with redundant \${DISTDIR} in path" fi - elif [[ ${f} == ${DISTDIR%/}/* ]]; then + elif [[ ${f} == "${DISTDIR%/}"/* ]]; then die "Arguments to unpack() cannot begin with \${DISTDIR} in EAPI ${EAPI}" elif [[ ${f} == /* ]]; then die "Arguments to unpack() cannot be absolute in EAPI ${EAPI}"