summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-12-13 03:49:37 +0000
committerZac Medico <zmedico@gentoo.org>2009-12-13 03:49:37 +0000
commit1cd177f8978193772add5e67d88b29262f9682a5 (patch)
tree16532dd1ea809428ac2a44582aa5da531f0ae123
parenta189a31d3d7f9ed02529f6a16212445e05ac8ed0 (diff)
downloadportage-1cd177f8978193772add5e67d88b29262f9682a5.tar.gz
portage-1cd177f8978193772add5e67d88b29262f9682a5.tar.bz2
portage-1cd177f8978193772add5e67d88b29262f9682a5.zip
Filter prefix variables ED, EPREFIX, and EROOT inside
filter_readonly_variables() but don't mark them readonly for now since some ebuilds/eclasses try to assign EROOT (such as kde4-base_pkg_setup) which causes the whole bash shell to exit like this: >>> Extracting info * CPV: kde-base/oxygen-icons-4.3.4 * REPO: gentoo * USE: elibc_glibc kernel_linux test userland_GNU x86 /var/tmp/portage/kde-base/oxygen-icons-4.3.4/temp/environment: line 2781: EROOT: readonly variable Also, add ED to the environment blacklist. (trunk r15030) svn path=/main/branches/2.1.7/; revision=15064
-rwxr-xr-xbin/ebuild.sh4
-rw-r--r--pym/portage/__init__.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 545a38ece..3cd655496 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1603,7 +1603,7 @@ READONLY_EBUILD_METADATA="DEFINED_PHASES DEPEND DESCRIPTION
PDEPEND PROVIDE RDEPEND RESTRICT SLOT SRC_URI"
READONLY_PORTAGE_VARS="D EBUILD EBUILD_PHASE \
- EBUILD_SH_ARGS ED EMERGE_FROM EROOT FILESDIR \
+ EBUILD_SH_ARGS EMERGE_FROM FILESDIR \
PORTAGE_BINPKG_FILE PORTAGE_BIN_PATH PORTAGE_IUSE \
PORTAGE_PYM_PATH PORTAGE_MUTABLE_FILTERED_VARS \
PORTAGE_SAVED_READONLY_VARS PORTAGE_TMPDIR T WORKDIR"
@@ -1657,7 +1657,7 @@ filter_readonly_variables() {
SANDBOX_DEBUG_LOG SANDBOX_DISABLED SANDBOX_LIB
SANDBOX_LOG SANDBOX_ON"
filtered_vars="$readonly_bash_vars $bash_misc_vars
- $READONLY_PORTAGE_VARS PATH"
+ $READONLY_PORTAGE_VARS ED EPREFIX EROOT PATH"
if hasq --filter-sandbox $* ; then
filtered_vars="${filtered_vars} SANDBOX_.*"
else
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index b4484f5f1..6c1350065 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -1375,7 +1375,7 @@ class config(object):
_env_blacklist = [
"A", "AA", "CATEGORY", "DEPEND", "DESCRIPTION", "EAPI",
- "EBUILD_PHASE", "EMERGE_FROM", "EPREFIX", "EROOT",
+ "EBUILD_PHASE", "ED", "EMERGE_FROM", "EPREFIX", "EROOT",
"HOMEPAGE", "INHERITED", "IUSE",
"KEYWORDS", "LICENSE", "PDEPEND", "PF", "PKGUSE",
"PORTAGE_CONFIGROOT", "PORTAGE_IUSE",