From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 22 Apr 2019 07:02:01 +0000 (-0700)
Subject: sys-apps/portage: fix PYTHONPATH in pkg_postinst (bug 683932)
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=c3a95fc7560502ad7494862c49a4c0a0ed33c58b;p=gentoo.git

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 e014d9402bb8..f3f538b66de6 100644
--- 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 9950d305dc6c..d91ed6170bb7 100644
--- 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.