diff options
| author |   Florian Schmaus <flow@gentoo.org> | 2025-01-01 15:42:33 +0100 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2025-01-01 18:14:11 +0000 |
| commit | 91caf49d56c5682004e4522825aff126530f32e2 (patch) | |
| tree | f88292025d4b6130b52ac9b718372127598fb54d /sys-apps/portage | |
| parent | app-editors/xemacs: Stabilize 21.5.35-r6 ppc64, #947311 (diff) | |
| download | gentoo-91caf49d56c5682004e4522825aff126530f32e2.tar.gz gentoo-91caf49d56c5682004e4522825aff126530f32e2.tar.bz2 gentoo-91caf49d56c5682004e4522825aff126530f32e2.zip | |
sys-apps/portage: prepare for unexported PMS variables
Once a future EAPI does no longer export PMS variables (bug #721088 and
[1]), we need to explicitly ensure that those are exported to helper
commands which expect certain PMS variables in their process
environment.
While the portage ebuild is usually deliberately not using the latest
EAPI, it may be a good idea to make it explicit that the _compat_upgrade
helpers expect ED in their process environment.
1: https://github.com/gentoo/portage/pull/1407
Signed-off-by: Florian Schmaus <flow@gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/39934
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sys-apps/portage')
| -rw-r--r-- | sys-apps/portage/portage-9999.ebuild | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild index 5958c3dd1f5e..e1afb04b085f 100644 --- a/sys-apps/portage/portage-9999.ebuild +++ b/sys-apps/portage/portage-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -181,18 +181,22 @@ pkg_preinst() { -u PORTDIR \ -u PORTDIR_OVERLAY \ PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ + ED="${ED}" \ "${PYTHON}" -m portage._compat_upgrade.default_locations || die env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \ PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ + ED="${ED}" \ "${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die env -u FEATURES -u PORTAGE_REPOSITORIES \ PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ + ED="${ED}" \ "${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die env -u BINPKG_FORMAT \ PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ + ED="${ED}" \ "${PYTHON}" -m portage._compat_upgrade.binpkg_format || die fi |