From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BB7F615800A for ; Fri, 28 Jul 2023 08:02:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E8E44E0A6F; Fri, 28 Jul 2023 08:02:43 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D453DE0A6F for ; Fri, 28 Jul 2023 08:02:43 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1BCCE335DB2 for ; Fri, 28 Jul 2023 08:02:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7E49CACD for ; Fri, 28 Jul 2023 08:02:41 +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: <1690531359.1cb05eb6b30719c84916f57c789ca9cef1f131f6.sam@gentoo> Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/ X-VCS-Repository: repo/proj/prefix X-VCS-Files: scripts/bootstrap-prefix.sh X-VCS-Directories: scripts/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 1cb05eb6b30719c84916f57c789ca9cef1f131f6 X-VCS-Branch: master Date: Fri, 28 Jul 2023 08:02:41 +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: 65b770d9-9b0b-4d42-af1c-98ae8cbcd0a0 X-Archives-Hash: 7918899f9b70bddac6a21289b6c0c55e commit: 1cb05eb6b30719c84916f57c789ca9cef1f131f6 Author: Arsen Arsenović gentoo org> AuthorDate: Thu Jul 27 18:16:20 2023 +0000 Commit: Sam James gentoo org> CommitDate: Fri Jul 28 08:02:39 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=1cb05eb6 scripts/bootstrap-prefix: remove error-prone shell logic This script, in particular, causes the second emerge branch to be taken if the first branch is intended and failed, obscuring errors. Signed-off-by: Arsen Arsenović gentoo.org> Signed-off-by: Sam James gentoo.org> scripts/bootstrap-prefix.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index a4247c3241..d1387391d9 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -1972,9 +1972,11 @@ bootstrap_stage3() { # pre_emerge_pkgs relies on stage 2 portage. pre_emerge_pkgs() { - is-rap \ - && without_stack_emerge_pkgs "$@" \ - || with_stack_emerge_pkgs "$@" + if is-rap; then + without_stack_emerge_pkgs "$@" + else + with_stack_emerge_pkgs "$@" + fi } # Some packages fail to properly depend on sys-apps/texinfo.