summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2019-04-22 00:02:01 -0700
committerZac Medico <zmedico@gentoo.org>2019-04-22 00:14:39 -0700
commitc3a95fc7560502ad7494862c49a4c0a0ed33c58b (patch)
tree058484efe3579a30940da91c99d8948ea7f822f2 /sys-apps/portage
parentapp-crypt/bcwipe: fix digest (diff)
downloadgentoo-c3a95fc7560502ad7494862c49a4c0a0ed33c58b.tar.gz
gentoo-c3a95fc7560502ad7494862c49a4c0a0ed33c58b.tar.bz2
gentoo-c3a95fc7560502ad7494862c49a4c0a0ed33c58b.zip
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>
Diffstat (limited to 'sys-apps/portage')
-rw-r--r--sys-apps/portage/portage-2.3.64.ebuild2
-rw-r--r--sys-apps/portage/portage-9999.ebuild2
2 files changed, 2 insertions, 2 deletions
diff --git a/sys-apps/portage/portage-2.3.64.ebuild b/sys-apps/portage/portage-2.3.64.ebuild
index e014d9402bb..f3f538b66de 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 9950d305dc6..d91ed6170bb 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.