diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2013-06-27 21:04:49 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2013-06-27 21:04:49 +0000 |
| commit | 51278f65b9688853cb06145c84f82e59db7b514e (patch) | |
| tree | a2c4a9a73bb37f748bac938fe58155722d0a3a88 /scripts | |
| parent | unmask pambase[pam_krb5] now that it is keyworded (diff) | |
| download | gentoo-2-51278f65b9688853cb06145c84f82e59db7b514e.tar.gz gentoo-2-51278f65b9688853cb06145c84f82e59db7b514e.tar.bz2 gentoo-2-51278f65b9688853cb06145c84f82e59db7b514e.zip | |
Remove call to emerge --clean.
Since AUTOCLEAN=yes is the default, there's no need to call emerge
--clean. Also, remove redundant AUTOCLEAN=yes export, since that's
the default and if the user has disabled AUTOCLEAN then that's their
problem.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/bootstrap.sh | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index cda6de4cee72..f5b3534578e3 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/scripts/bootstrap.sh,v 1.96 2012/10/23 02:25:23 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/scripts/bootstrap.sh,v 1.97 2013/06/27 21:04:49 zmedico Exp $ # people who were here: # (drobbins, 06 Jun 2003) @@ -52,7 +52,7 @@ v_echo() { env "$@" } -cvsver="$Header: /var/cvsroot/gentoo-x86/scripts/bootstrap.sh,v 1.96 2012/10/23 02:25:23 zmedico Exp $" +cvsver="$Header: /var/cvsroot/gentoo-x86/scripts/bootstrap.sh,v 1.97 2013/06/27 21:04:49 zmedico Exp $" cvsver=${cvsver##*,v } cvsver=${cvsver%%Exp*} cvsyear=${cvsver#* } @@ -304,10 +304,6 @@ echo --------------------------------------------------------------------------- [[ -x /usr/sbin/gcc-config ]] && GCC_CONFIG="/usr/sbin/gcc-config" [[ -x /usr/bin/gcc-config ]] && GCC_CONFIG="/usr/bin/gcc-config" -# Make sure we automatically clean old instances, else we may run -# into issues, bug #32140. -export AUTOCLEAN="yes" - # Allow portage to overwrite stuff export CONFIG_PROTECT="-*" @@ -350,7 +346,6 @@ if [[ -n ${STRAP_RUN} ]] ; then if [[ -x ${GCC_CONFIG} ]] && ${GCC_CONFIG} --get-current-profile &>/dev/null then # Make sure we get the old gcc unmerged ... - emerge --clean || cleanup 1 emerge --prune sys-devel/gcc || cleanup 1 # Make sure the profile and /lib/cpp and /usr/bin/cc are valid ... ${GCC_CONFIG} "$(${GCC_CONFIG} --get-current-profile)" &>/dev/null |