Unset prefix vars for depend phase when EAPI is unknown.
authorZac Medico <zmedico@gentoo.org>
Sat, 12 Dec 2009 09:13:18 +0000 (09:13 -0000)
committerZac Medico <zmedico@gentoo.org>
Sat, 12 Dec 2009 09:13:18 +0000 (09:13 -0000)
svn path=/main/trunk/; revision=15049

pym/portage/__init__.py

index ef73e45959bba4a5530eeec0e7a1677bb6290cff..4e0d8cc830039b5be4265daf49f9852970dcfa82 100644 (file)
@@ -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)