diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-12-11 05:56:09 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-12-11 05:56:09 +0000 |
| commit | 7d6c38cf7151d61e90c9660a3c34d4a632694e46 (patch) | |
| tree | c9feb608d524d5f6b816834f29d482ecd80e096e | |
| parent | 0765de4d004df42a3ebec40b10b1d88155e31911 (diff) | |
| download | portage-7d6c38cf7151d61e90c9660a3c34d4a632694e46.tar.gz portage-7d6c38cf7151d61e90c9660a3c34d4a632694e46.tar.bz2 portage-7d6c38cf7151d61e90c9660a3c34d4a632694e46.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.
svn path=/main/trunk/; revision=15030
| -rwxr-xr-x | bin/ebuild.sh | 4 | ||||
| -rw-r--r-- | pym/portage/__init__.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 630ff3118..0bbfc10f0 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -1597,7 +1597,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" @@ -1651,7 +1651,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 e9c301ed4..62cdd7911 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", |