From cacbbe33b839737fecff2b81fc638bb40f08686c Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 10 Dec 2011 09:49:33 -0800 Subject: config.environ: allow prefix vars if no EAPI This allows access to EPREFIX inside things like post_sync hooks, where EAPI is undefined. --- pym/portage/package/ebuild/config.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pym') diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py index df719e2f1..9bb26cad0 100644 --- a/pym/portage/package/ebuild/config.py +++ b/pym/portage/package/ebuild/config.py @@ -2284,9 +2284,9 @@ class config(object): # useless with prefix configurations. This brings compatibility with # the prefix branch of portage, which also supports EPREFIX for all # EAPIs (for obvious reasons). - if phase == 'depend' or eapi is None or \ + if phase == 'depend' or \ ('force-prefix' not in self.features and - not eapi_supports_prefix(eapi)): + eapi is not None and not eapi_supports_prefix(eapi)): mydict.pop("ED", None) mydict.pop("EPREFIX", None) mydict.pop("EROOT", None) -- cgit v1.2.3-1-g7c22