summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-11-26 02:05:16 +0000
committerZac Medico <zmedico@gentoo.org>2007-11-26 02:05:16 +0000
commit94486ef8d1b2507244d98cab4286c8aecbabad13 (patch)
treed51c2beb3f2a50cc4fb08847b047a25b111de652
parent148abc1340e37ef2b5ba84ea4df103d20dd78eba (diff)
downloadportage-94486ef8d1b2507244d98cab4286c8aecbabad13.tar.gz
portage-94486ef8d1b2507244d98cab4286c8aecbabad13.tar.bz2
portage-94486ef8d1b2507244d98cab4286c8aecbabad13.zip
* Move filtering of a bunch of portage config variables from
save_ebuild_env() to config.environ(). * Add EMERGE_FROM to the READONLY_PORTAGE_VARS list. svn path=/main/trunk/; revision=8670
-rwxr-xr-xbin/ebuild.sh5
-rwxr-xr-xbin/isolated-functions.sh31
-rw-r--r--pym/portage/__init__.py14
3 files changed, 26 insertions, 24 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 7276a7ceb..c3209f886 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1340,8 +1340,9 @@ READONLY_EBUILD_METADATA="DEPEND DESCRIPTION
EAPI HOMEPAGE INHERITED IUSE KEYWORDS LICENSE
PDEPEND PROVIDE RDEPEND RESTRICT SLOT SRC_URI"
-READONLY_PORTAGE_VARS="D EBUILD EBUILD_PHASE EBUILD_SH_ARGS FILESDIR \
- PORTAGE_BIN_PATH PORTAGE_PYM_PATH PORTAGE_TMPDIR T WORKDIR"
+READONLY_PORTAGE_VARS="D EBUILD EBUILD_PHASE \
+ EBUILD_SH_ARGS EMERGE_FROM FILESDIR PORTAGE_BIN_PATH \
+ PORTAGE_PYM_PATH PORTAGE_TMPDIR T WORKDIR"
# @FUNCTION: filter_readonly_variables
# @DESCRIPTION: [--filter-sandbox]
diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index d764be5f1..30d575266 100755
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -413,34 +413,23 @@ save_ebuild_env() {
source_all_bashrcs ebuild_phase ebuild_phase_with_hooks
# portage config variables and variables set directly by portage
- unset ACCEPT_KEYWORDS AUTOCLEAN BAD BRACKET BUILD_PREFIX CLEAN_DELAY \
- COLLISION_IGNORE COLS CONFIG_PROTECT CONFIG_PROTECT_MASK \
+ unset BAD BRACKET BUILD_PREFIX COLS \
DISTCC_DIR DISTDIR DOC_SYMLINKS_DIR EBUILD_MASTER_PID \
- ECLASSDIR ECLASS_DEPTH EMERGE_DEFAULT_OPTS \
- EMERGE_WARNING_DELAY ENDCOL FAKEROOTKEY FEATURES \
- FETCHCOMMAND FETCHCOMMAND_FTP FETCHCOMMAND_HTTP FETCHCOMMAND_SFTP \
- GENTOO_MIRRORS GOOD HILITE HOME IMAGE \
+ ECLASSDIR ECLASS_DEPTH ENDCOL FAKEROOTKEY FEATURES \
+ GOOD HILITE HOME IMAGE \
KV LAST_E_CMD LAST_E_LEN LD_PRELOAD MOPREFIX \
- NORMAL O PATH PKGDIR PKGUSE PKG_LOGDIR PKG_TMPDIR \
+ NORMAL PATH PKGDIR PKGUSE PKG_LOGDIR PKG_TMPDIR \
PORTAGE_ACTUAL_DISTDIR PORTAGE_ARCHLIST PORTAGE_BASHRC \
- PORTAGE_BINHOST_CHUNKSIZE PORTAGE_BINPKG_TMPFILE \
- PORTAGE_BUILDDIR PORTAGE_CALLER \
+ PORTAGE_BINPKG_TMPFILE PORTAGE_BUILDDIR \
PORTAGE_COLORMAP PORTAGE_CONFIGROOT PORTAGE_DEBUG \
- PORTAGE_DEPCACHEDIR PORTAGE_ELOG_CLASSES PORTAGE_ELOG_MAILFROM \
- PORTAGE_ELOG_MAILSUBJECT PORTAGE_ELOG_MAILURI PORTAGE_ELOG_SYSTEM \
- PORTAGE_GID PORTAGE_GPG_DIR PORTAGE_GPG_KEY PORTAGE_INST_GID \
+ PORTAGE_DEPCACHEDIR PORTAGE_GID PORTAGE_INST_GID \
PORTAGE_INST_UID PORTAGE_LOG_FILE PORTAGE_MASTER_PID \
- PORTAGE_REPO_NAME PORTAGE_RESTRICT \
- PORTAGE_RSYNC_EXTRA_OPTS PORTAGE_RSYNC_OPTS \
- PORTAGE_RSYNC_RETRIES PORTAGE_TMPFS PORTAGE_WORKDIR_MODE PORTDIR \
- PORTDIR_OVERLAY PORT_LOGDIR PROFILE_PATHS PWORKDIR \
- QUICKPKG_DEFAULT_OPTS QA_INTERCEPTORS \
+ PORTAGE_REPO_NAME PORTAGE_RESTRICT PORTAGE_WORKDIR_MODE PORTDIR \
+ PORTDIR_OVERLAY PROFILE_PATHS PWORKDIR QA_INTERCEPTORS \
RC_DEFAULT_INDENT RC_DOT_PATTERN RC_ENDCOL \
RC_INDENTATION READONLY_EBUILD_METADATA READONLY_PORTAGE_VARS \
- RESUMECOMMAND RESUMECOMMAND_HTTP \
- RESUMECOMMAND_HTTP RESUMECOMMAND_SFTP ROOT ROOTPATH RPMDIR \
- STARTDIR SYNC TMP TMPDIR USE_EXPAND \
- USE_EXPAND_HIDDEN USE_ORDER WARN XARGS _RC_GET_KV_CACHE
+ ROOT ROOTPATH RPMDIR STARTDIR TMP TMPDIR USE_EXPAND \
+ WARN XARGS _RC_GET_KV_CACHE
set
export
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index b739a4cfc..36bd65ee3 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -860,7 +860,19 @@ class config(object):
# Filter selected variables in the config.environ() method so that
# they don't needlessly propagate down into the ebuild environment.
- _environ_filter = frozenset(["PORTAGE_ECLASS_WARNING_ENABLE"])
+ _environ_filter = frozenset(["ACCEPT_KEYWORDS", "AUTOCLEAN",
+ "CLEAN_DELAY", "COLLISION_IGNORE", "CONFIG_PROTECT",
+ "CONFIG_PROTECT_MASK", "EMERGE_DEFAULT_OPTS",
+ "EMERGE_WARNING_DELAY", "FETCHCOMMAND", "FETCHCOMMAND_FTP",
+ "FETCHCOMMAND_HTTP", "FETCHCOMMAND_SFTP", "GENTOO_MIRRORS", "O",
+ "PORTAGE_BINHOST_CHUNKSIZE", "PORTAGE_CALLER",
+ "PORTAGE_ECLASS_WARNING_ENABLE", "PORTAGE_ELOG_CLASSES",
+ "PORTAGE_ELOG_MAILFROM", "PORTAGE_ELOG_MAILSUBJECT",
+ "PORTAGE_ELOG_MAILURI", "PORTAGE_ELOG_SYSTEM", "PORTAGE_GPG_DIR",
+ "PORTAGE_GPG_KEY", "PORTAGE_RSYNC_EXTRA_OPTS", "PORTAGE_RSYNC_OPTS",
+ "PORTAGE_RSYNC_RETRIES", "PORT_LOGDIR", "QUICKPKG_DEFAULT_OPTS",
+ "RESUMECOMMAND", "RESUMECOMMAND_HTTP", "RESUMECOMMAND_HTTP",
+ "RESUMECOMMAND_SFTP", "SYNC", "USE_EXPAND_HIDDEN", "USE_ORDER"])
def __init__(self, clone=None, mycpv=None, config_profile_path=None,
config_incrementals=None, config_root=None, target_root=None,