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 <[email protected]>
hanetzer · Apr 22, 2019 · c3a95fc · c3a95fc
1 parent 50aa79e
commit c3a95fc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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.