diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-12-13 03:50:12 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-12-13 03:50:12 +0000 |
| commit | e9ef494fb4270b41b57f994cc26a30dc03e8fe21 (patch) | |
| tree | a1698d3ca6e87acf3a98cf9b1ec40f1b0a6860f7 | |
| parent | 8340985f76ce62e4de796dd84f986e6484c64081 (diff) | |
| download | portage-e9ef494fb4270b41b57f994cc26a30dc03e8fe21.tar.gz portage-e9ef494fb4270b41b57f994cc26a30dc03e8fe21.tar.bz2 portage-e9ef494fb4270b41b57f994cc26a30dc03e8fe21.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). (trunk r15032)
svn path=/main/branches/2.1.7/; revision=15066
| -rw-r--r-- | pym/portage/__init__.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 6c1350065..54d36f9e8 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") |