[gentoo-commits] repo/gentoo:master commit in: scripts/

["Joshua Kinard" <kumba@gentoo.org>]

commit:     67495c6078f95162d424d1c0942ad55c33a02149
Author:     Joshua Kinard <kumba <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  2 03:18:37 2023 +0000
Commit:     Joshua Kinard <kumba <AT> gentoo <DOT> 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 <kumba <AT> 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