| 1 |
The changes related bug 373349 were more aggressive than necessary, |
| 2 |
causing the PORTDIR variable to be omitted from config.environ() |
| 3 |
calls when the EAPI is defined. We really only need to filter the |
| 4 |
PORTDIR variable when the current EAPI requires it. |
| 5 |
|
| 6 |
Fixes: 802e7d0bdd96 ("Do not export PORTDIR & ECLASSDIR in EAPI 7") |
| 7 |
Bug: https://bugs.gentoo.org/653230 |
| 8 |
--- |
| 9 |
pym/portage/eapi.py | 2 +- |
| 10 |
1 file changed, 1 insertion(+), 1 deletion(-) |
| 11 |
|
| 12 |
diff --git a/pym/portage/eapi.py b/pym/portage/eapi.py |
| 13 |
index cdbbf07fb..b0f993a14 100644 |
| 14 |
--- a/pym/portage/eapi.py |
| 15 |
+++ b/pym/portage/eapi.py |
| 16 |
@@ -159,7 +159,7 @@ def _get_eapi_attrs(eapi): |
| 17 |
dots_in_use_flags = (eapi is None or eapi_allows_dots_in_use_flags(eapi)), |
| 18 |
empty_groups_always_true = (eapi is not None and eapi_empty_groups_always_true(eapi)), |
| 19 |
exports_EBUILD_PHASE_FUNC = (eapi is None or eapi_exports_EBUILD_PHASE_FUNC(eapi)), |
| 20 |
- exports_PORTDIR = (eapi is not None and eapi_exports_PORTDIR(eapi)), |
| 21 |
+ exports_PORTDIR = (eapi is None or eapi_exports_PORTDIR(eapi)), |
| 22 |
exports_ECLASSDIR = (eapi is not None and eapi_exports_ECLASSDIR(eapi)), |
| 23 |
feature_flag_test = True, |
| 24 |
feature_flag_targetroot = (eapi is not None and eapi_has_targetroot(eapi)), |
| 25 |
-- |
| 26 |
2.13.6 |
Archives