gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

scripts/bootstrap.sh: Don't bail if 'emerge --prune' returns 1

Browse Source 
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@gentoo.org>
This commit is contained in:
Joshua Kinard
2023-10-01 23:18:37 -04:00
parent 4333aa4e77
commit 67495c6078
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/bootstrap.sh
View File

@@ -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