Unset prefix vars for depend phase when EAPI is unknown. (trunk r15049)

svn path=/main/branches/2.1.7/; revision=15083

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index b70c5fe26bb3858e12a82054ee086e19aacbdafe..04bbfdc877b10d6c1314a042f27e1c434d12a778 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -3777,7 +3777,8 @@ class config(object):
                        mydict.pop("AA", None)
 
                # Prefix variables are supported starting with EAPI 3.
-               if eapi in ("0", "1", "2"):
+               # eapi is None for 'depend' phase
+               if eapi in (None, "0", "1", "2"):
                        mydict.pop("ED", None)
                        mydict.pop("EPREFIX", None)
                        mydict.pop("EROOT", None)