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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2C9FB158089 for ; Mon, 2 Oct 2023 03:25:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 411FA2BC01D; Mon, 2 Oct 2023 03:25:18 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1ED492BC01D for ; Mon, 2 Oct 2023 03:25:18 +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 10ED4335C31 for ; Mon, 2 Oct 2023 03:25:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 572228EB for ; Mon, 2 Oct 2023 03:25:15 +0000 (UTC) From: "Joshua Kinard" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joshua Kinard" Message-ID: <1696216717.67495c6078f95162d424d1c0942ad55c33a02149.kumba@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: scripts/ X-VCS-Repository: repo/gentoo X-VCS-Files: scripts/bootstrap.sh X-VCS-Directories: scripts/ X-VCS-Committer: kumba X-VCS-Committer-Name: Joshua Kinard X-VCS-Revision: 67495c6078f95162d424d1c0942ad55c33a02149 X-VCS-Branch: master Date: Mon, 2 Oct 2023 03:25:15 +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: 43d219ec-c824-4240-9b26-01073af3cad6 X-Archives-Hash: e3f68e254ebac8ecb1d1a4e1187202e8 commit: 67495c6078f95162d424d1c0942ad55c33a02149 Author: Joshua Kinard gentoo org> AuthorDate: Mon Oct 2 03:18:37 2023 +0000 Commit: Joshua Kinard gentoo org> CommitDate: Mon Oct 2 03:18:37 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67495c60 scripts/bootstrap.sh: Don't bail if 'emerge --prune' returns 1 If 'emerge --prune' doesn't find any older gcc's to prune, it will return '1', which causes bootstrap.sh to run the cleanup method, and this results in catalyst aborting at the end of a stage2 build. Removing the all to cleanup prevents this. Issue was added due to resolution of Bug #851750. Closes: https://bugs.gentoo.org/881839 Signed-off-by: Joshua Kinard gentoo.org> scripts/bootstrap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 1e998075691a..48ed539e8186 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -351,7 +351,7 @@ if [[ -n ${STRAP_RUN} ]] ; then fi if [[ "${output}" = *'All selected packages:'* ]] ; then # Make sure we get the old gcc unmerged ... - ${V_ECHO} emerge ${STRAP_EMERGE_OPTS} --prune sys-devel/gcc || cleanup 1 + ${V_ECHO} emerge ${STRAP_EMERGE_OPTS} --prune sys-devel/gcc # Make sure the profile and /lib/cpp and /usr/bin/cc are valid ... ${GCC_CONFIG} "$(${GCC_CONFIG} --get-current-profile)" &>/dev/null fi