From 7d6c38cf7151d61e90c9660a3c34d4a632694e46 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 11 Dec 2009 05:56:09 +0000 Subject: 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 --- pym/portage/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pym') 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", -- cgit v1.2.3-1-g7c22