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 /pym | |
| 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
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
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", |