sys-apps/portage: fix PYTHONPATH in pkg_postinst (bug 683932)

Since PYTHON_SITEDIR begins with ${EPREFIX}, avoid a double prefix
by using ${D} instead of ${ED}.

Bug: https://bugs.gentoo.org/683932
Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Zac Medico <zmedico@gentoo.org>

diff --git a/sys-apps/portage/portage-2.3.64.ebuild b/sys-apps/portage/portage-2.3.64.ebuild
index e014d9402bb85c8eace4ec23f02f4eab961fae64..f3f538b66de6d536c95e5ad43f091d64018718c0 100644 (file)
--- a/sys-apps/portage/portage-2.3.64.ebuild
+++ b/sys-apps/portage/portage-2.3.64.ebuild
@@ -244,7 +244,7 @@ pkg_preinst() {
                -u PORTAGE_REPOSITORIES \
                -u PORTDIR \
                -u PORTDIR_OVERLAY \
-               PYTHONPATH="${ED%/}${PYTHON_SITEDIR}${PYTHONPATH:+:${PYTHONPATH}}" \
+               PYTHONPATH="${D%/}${PYTHON_SITEDIR}${PYTHONPATH:+:${PYTHONPATH}}" \
                "${PYTHON}" -m portage._compat_upgrade.default_locations || die
 
        # elog dir must exist to avoid logrotate error for bug #415911.

diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index 9950d305dc6ce17049d31adc6047dbfd12f65d66..d91ed6170bb735f18866eb6344d66011d488cf51 100644 (file)
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -254,7 +254,7 @@ pkg_preinst() {
                -u PORTAGE_REPOSITORIES \
                -u PORTDIR \
                -u PORTDIR_OVERLAY \
-               PYTHONPATH="${ED%/}${PYTHON_SITEDIR}${PYTHONPATH:+:${PYTHONPATH}}" \
+               PYTHONPATH="${D%/}${PYTHON_SITEDIR}${PYTHONPATH:+:${PYTHONPATH}}" \
                "${PYTHON}" -m portage._compat_upgrade.default_locations || die
 
        # elog dir must exist to avoid logrotate error for bug #415911.