From 2605482429e1263404b39efb13307e7bd5d1196f Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 13 Dec 2009 03:54:07 +0000 Subject: Unset prefix vars for depend phase (even if EAPI is known). (trunk r15050) svn path=/main/branches/2.1.7/; revision=15084 --- pym/portage/__init__.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 04bbfdc87..4a6f8fd85 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -3777,8 +3777,7 @@ class config(object): mydict.pop("AA", None) # Prefix variables are supported starting with EAPI 3. - # eapi is None for 'depend' phase - if eapi in (None, "0", "1", "2"): + if phase == 'depend' or eapi in (None, "0", "1", "2"): mydict.pop("ED", None) mydict.pop("EPREFIX", None) mydict.pop("EROOT", None) -- cgit v1.2.3-1-g7c22