From 255af602e7c5f74460104fbfaa80c09a31b44a36 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 17 Sep 2010 22:23:54 -0700 Subject: Put more variables in PORTAGE_READONLY_VARS instead of using save_ebuild_env() to unset them. --- bin/isolated-functions.sh | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) (limited to 'bin/isolated-functions.sh') diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh index 3069a08bb..cf258bef3 100644 --- a/bin/isolated-functions.sh +++ b/bin/isolated-functions.sh @@ -589,29 +589,15 @@ save_ebuild_env() { unset ACCEPT_LICENSE BAD BRACKET BUILD_PREFIX COLS \ DISTCC_DIR DISTDIR DOC_SYMLINKS_DIR \ EBUILD_FORCE_TEST EBUILD_MASTER_PID \ - ECLASSDIR ECLASS_DEPTH ENDCOL FAKEROOTKEY \ + ECLASS_DEPTH ENDCOL FAKEROOTKEY \ GOOD HILITE HOME \ LAST_E_CMD LAST_E_LEN LD_PRELOAD MISC_FUNCTIONS_ARGS MOPREFIX \ NOCOLOR NORMAL PKGDIR PKGUSE PKG_LOGDIR PKG_TMPDIR \ - PORTAGE_ACTUAL_DISTDIR PORTAGE_ARCHLIST \ - PORTAGE_BASHRC PM_EBUILD_HOOK_DIR PORTAGE_BASHRCS_SOURCED \ - PORTAGE_BINPKG_TAR_OPTS PORTAGE_BINPKG_TMPFILE \ - PORTAGE_BUNZIP2_COMMAND PORTAGE_BZIP2_COMMAND \ - PORTAGE_COLORMAP PORTAGE_CONFIGROOT PORTAGE_DEBUG \ - PORTAGE_DEPCACHEDIR PORTAGE_EBUILD_EXIT_FILE PORTAGE_GID \ - PORTAGE_GRPNAME PORTAGE_INST_GID \ - PORTAGE_INST_UID PORTAGE_IPC_DAEMON \ - PORTAGE_LOG_FILE \ - PORTAGE_NONFATAL PORTAGE_QUIET PORTAGE_PYTHON \ - PORTAGE_REPO_NAME PORTAGE_RESTRICT \ - PORTAGE_SANDBOX_COMPAT_LEVEL PORTAGE_SIGPIPE_STATUS \ - PORTAGE_UPDATE_ENV \ - PORTAGE_USERNAME PORTAGE_VERBOSE PORTAGE_WORKDIR_MODE PORTDIR \ - PORTDIR_OVERLAY ${!PORTAGE_SANDBOX_*} PREROOTPATH \ - PROFILE_PATHS PWORKDIR QA_INTERCEPTORS \ - RC_DEFAULT_INDENT RC_DOT_PATTERN RC_ENDCOL \ - RC_INDENTATION \ - REPLACING_VERSIONS REPLACED_BY_VERSION \ + PORTAGE_BASHRCS_SOURCED PORTAGE_NONFATAL PORTAGE_QUIET \ + PORTAGE_SANDBOX_DENY PORTAGE_SANDBOX_PREDICT \ + PORTAGE_SANDBOX_READ PORTAGE_SANDBOX_WRITE PREROOTPATH \ + PWORKDIR QA_INTERCEPTORS \ + RC_DEFAULT_INDENT RC_DOT_PATTERN RC_ENDCOL RC_INDENTATION \ ROOT ROOTPATH RPMDIR TEMP TMP TMPDIR USE_EXPAND \ WARN XARGS _RC_GET_KV_CACHE -- cgit v1.2.3-1-g7c22