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 8EEE41580EB for ; Fri, 30 May 2025 08:14:48 +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 59B963430D4 for ; Fri, 30 May 2025 08:14:48 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 8C4D81104A8; 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 840581104A8 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 4004834309B 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 C4E9D28F2 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.a8af8f7e995c7d1142794768b440e2ca0f02e4d4.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: a8af8f7e995c7d1142794768b440e2ca0f02e4d4 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: 13f1f33f-a80f-4acd-9bc4-5ddf5544729c X-Archives-Hash: e30d01b97fc55058752876159cd0d056 commit: a8af8f7e995c7d1142794768b440e2ca0f02e4d4 Author: Kerin Millar plushkava net> AuthorDate: Sat Jul 27 20:20:16 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=a8af8f7e phase-helpers.sh: have unzip read /dev/null to impede interactive prompts Rather than reinvent the wheel that is yes(1), redirect STDIN from /dev/null. For the circumstances described by bug #336285, unzip will immediately exit. In other situations where a prompt may appear, unzip may print a message such as '(EOF or read error, treating as "[N]one" ...)' before immediately exiting, which is an improvement on the prior behaviour. In either case, the exit status value will be something other than zero. Bug: https://bugs.gentoo.org/336285 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 715c434ca6..3378d8971a 100644 --- a/bin/phase-helpers.sh +++ b/bin/phase-helpers.sh @@ -414,9 +414,9 @@ unpack() { ;; zip|jar) # unzip will interactively prompt under some error conditions, - # as reported in bug #336285 - ( set +x ; while true ; do echo n || break ; done ) | \ - unzip -qo "${srcdir}${f}" || die "${myfail}" + # as reported in bug #336285. Inducing EOF on STDIN makes for + # an adequate countermeasure. + unzip -qo "${srcdir}${f}"