From 67495c6078f95162d424d1c0942ad55c33a02149 Mon Sep 17 00:00:00 2001 From: Joshua Kinard Date: Sun, 1 Oct 2023 23:18:37 -0400 Subject: [PATCH] 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 --- scripts/bootstrap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 1e998075691ae..48ed539e81869 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