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 8C76515808A for ; Tue, 22 Jul 2025 22:31:33 +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 93AA5341CC1 for ; Tue, 22 Jul 2025 22:30:06 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id E7C8D110560; Tue, 22 Jul 2025 22:29:59 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id DABB2110560 for ; Tue, 22 Jul 2025 22:29:59 +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 97D0A340FDE for ; Tue, 22 Jul 2025 22:29:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3E3A7329A 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: <1753223375.dbff78a1c6ce9f08b25a7c9978a177cc37f1b1bd.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: dbff78a1c6ce9f08b25a7c9978a177cc37f1b1bd 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: 39e11fe1-4ca7-4910-8ba7-089458b2c8b4 X-Archives-Hash: 0a3463119bb07c45e0dabc816f82c7bb commit: dbff78a1c6ce9f08b25a7c9978a177cc37f1b1bd Author: Kerin Millar plushkava net> AuthorDate: Fri Jul 18 05:36:28 2025 +0000 Commit: Sam James gentoo org> CommitDate: Tue Jul 22 22:29:35 2025 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=dbff78a1 phase-helpers.sh: hoist the my_output local to the top of unpack() Presently, all of the variables that are local to the unpack() function are declared at the top of its body, with the exception of the 'my_output' variable. Hoist it upwards so that it is declared at the same time as the others. Further, rename the variable to 'output'. Signed-off-by: Kerin Millar plushkava.net> Signed-off-by: Sam James gentoo.org> bin/phase-helpers.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh index 609d763915..a350d073a3 100644 --- a/bin/phase-helpers.sh +++ b/bin/phase-helpers.sh @@ -322,7 +322,7 @@ use_enable() { } unpack() { - local created_symlink suffix_known basename srcdir suffix f - + local created_symlink suffix_known basename output srcdir suffix f - local -a bzip2_cmd if (( $# == 0 )); then @@ -438,9 +438,8 @@ unpack() { __unpack_tar "${bzip2_cmd[@]}" ;; 7z) - local my_output - if ! my_output=$(7z x -y "${srcdir}${f}"); then - printf '%s\n' "${my_output}" >&2 + if ! output=$(7z x -y "${srcdir}${f}"); then + printf '%s\n' "${output}" >&2 false fi ;;