From e9ef494fb4270b41b57f994cc26a30dc03e8fe21 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 13 Dec 2009 03:50:12 +0000 Subject: 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 --- pym/portage/__init__.py | 6 ++++++ 1 file changed, 6 insertions(+) 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") -- cgit v1.2.3-1-g7c22