summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/ebuild.sh12
-rwxr-xr-xbin/isolated-functions.sh2
2 files changed, 1 insertions, 13 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 65684b05f..d4bceae40 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1831,18 +1831,6 @@ if ! hasq "$EBUILD_PHASE" clean cleanrm depend && \
unset x y
export SANDBOX_ON=${PORTAGE_SANDBOX_ON}
unset PORTAGE_SANDBOX_ON
-
- # After loading the environment, make sure the color variables
- # are in sync with the current NOCOLOR setting.
- case "${NOCOLOR:-false}" in
- yes|true)
- unset_colors
- ;;
- no|false)
- set_colors
- ;;
- esac
-
fi
if ! hasq "$EBUILD_PHASE" clean cleanrm && \
diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index 5c1444efd..82d2fed5b 100755
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -526,7 +526,7 @@ save_ebuild_env() {
ECLASSDIR ECLASS_DEPTH ENDCOL FAKEROOTKEY \
GOOD HILITE HOME IMAGE \
LAST_E_CMD LAST_E_LEN LD_PRELOAD MISC_FUNCTIONS_ARGS MOPREFIX \
- NORMAL PKGDIR PKGUSE PKG_LOGDIR PKG_TMPDIR \
+ NOCOLOR NORMAL PKGDIR PKGUSE PKG_LOGDIR PKG_TMPDIR \
PORTAGE_ACTUAL_DISTDIR PORTAGE_ARCHLIST \
PORTAGE_BASHRC PORTAGE_BASHRCS_SOURCED \
PORTAGE_BINPKG_TAR_OPTS PORTAGE_BINPKG_TMPFILE PORTAGE_BUILDDIR \