summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-12-11 06:09:43 +0000
committerZac Medico <zmedico@gentoo.org>2009-12-11 06:09:43 +0000
commit32e8aa1afa2f40aba1a6bba6ed7e5ec3dc71c748 (patch)
treeef2f86a28fe41da4601305a38acc7cb9338b3ad3
parent80b175067f59e81d6219c84803fe4c9bf6241e81 (diff)
downloadportage-32e8aa1afa2f40aba1a6bba6ed7e5ec3dc71c748.tar.gz
portage-32e8aa1afa2f40aba1a6bba6ed7e5ec3dc71c748.tar.bz2
portage-32e8aa1afa2f40aba1a6bba6ed7e5ec3dc71c748.zip
In config.environ(), only export ED, EPREFIX, and EROOT to the ebuild
environment starting with EAPI 3 (so people won't write ebuilds that are incompatible with older package managers). svn path=/main/trunk/; revision=15032
-rw-r--r--pym/portage/__init__.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 62cdd7911..8af73b6ff 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -3780,6 +3780,12 @@ class config(object):
if eapi not in ("0", "1", "2", "3"):
mydict.pop("AA", None)
+ # Prefix variables are supported starting with EAPI 3.
+ if eapi in ("0", "1", "2"):
+ mydict.pop("ED", None)
+ mydict.pop("EPREFIX", None)
+ mydict.pop("EROOT", None)
+
# sandbox's bashrc sources /etc/profile which unsets ROOTPATH,
# so we have to back it up and restore it.
rootpath = mydict.get("ROOTPATH")