From 54f2e2bbf03175577429dd83e64e72aabff10acf Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 26 Mar 2010 15:58:34 -0700 Subject: Add PORTAGE_USERNAME and PORTAGE_GROUPNAME to the environment whitelist and filter them from the saved environment. --- bin/isolated-functions.sh | 5 +++-- pym/portage/package/ebuild/config.py | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh index e7d0d4ee9..bf11c0d4b 100644 --- a/bin/isolated-functions.sh +++ b/bin/isolated-functions.sh @@ -555,11 +555,12 @@ save_ebuild_env() { PORTAGE_BASHRC PORTAGE_BASHRCS_SOURCED \ PORTAGE_BINPKG_TAR_OPTS PORTAGE_BINPKG_TMPFILE PORTAGE_BUILDDIR \ PORTAGE_COLORMAP PORTAGE_CONFIGROOT PORTAGE_DEBUG \ - PORTAGE_DEPCACHEDIR PORTAGE_GID PORTAGE_INST_GID \ + PORTAGE_DEPCACHEDIR PORTAGE_GID \ + PORTAGE_GROUPNAME PORTAGE_INST_GID \ PORTAGE_INST_UID PORTAGE_LOG_FILE PORTAGE_MASTER_PID \ PORTAGE_NONFATAL PORTAGE_QUIET \ PORTAGE_REPO_NAME PORTAGE_RESTRICT PORTAGE_UPDATE_ENV \ - PORTAGE_VERBOSE PORTAGE_WORKDIR_MODE PORTDIR \ + 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 \ diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py index 7be1af1e7..7b54d9a46 100644 --- a/pym/portage/package/ebuild/config.py +++ b/pym/portage/package/ebuild/config.py @@ -178,12 +178,13 @@ class config(object): "PORTAGE_BIN_PATH", "PORTAGE_BUILDDIR", "PORTAGE_COLORMAP", "PORTAGE_CONFIGROOT", "PORTAGE_DEBUG", "PORTAGE_DEPCACHEDIR", - "PORTAGE_GID", "PORTAGE_INST_GID", "PORTAGE_INST_UID", + "PORTAGE_GID", "PORTAGE_GROUPNAME", + "PORTAGE_INST_GID", "PORTAGE_INST_UID", "PORTAGE_IUSE", "PORTAGE_LOG_FILE", "PORTAGE_MASTER_PID", "PORTAGE_PYM_PATH", "PORTAGE_QUIET", "PORTAGE_REPO_NAME", "PORTAGE_RESTRICT", - "PORTAGE_TMPDIR", "PORTAGE_UPDATE_ENV", + "PORTAGE_TMPDIR", "PORTAGE_UPDATE_ENV", "PORTAGE_USERNAME", "PORTAGE_VERBOSE", "PORTAGE_WORKDIR_MODE", "PORTDIR", "PORTDIR_OVERLAY", "PREROOTPATH", "PROFILE_PATHS", "ROOT", "ROOTPATH", "T", "TMP", "TMPDIR", -- cgit v1.2.3-1-g7c22