| 1 |
commit: 1471339d008bb42ce9b727ad0bf7aa354797d712 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Apr 19 04:49:57 2019 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Apr 19 04:50:19 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1471339d |
| 7 |
|
| 8 |
sys-apps/portage: update 9999 with backward compat for bug 378603 |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/378603 |
| 11 |
Package-Manager: Portage-2.3.64, Repoman-2.3.12 |
| 12 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
| 13 |
|
| 14 |
sys-apps/portage/portage-9999.ebuild | 19 +++++++++---------- |
| 15 |
1 file changed, 9 insertions(+), 10 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild |
| 18 |
index 42273cc4fdd..5ac144404c9 100644 |
| 19 |
--- a/sys-apps/portage/portage-9999.ebuild |
| 20 |
+++ b/sys-apps/portage/portage-9999.ebuild |
| 21 |
@@ -247,16 +247,15 @@ python_install_all() { |
| 22 |
} |
| 23 |
|
| 24 |
pkg_preinst() { |
| 25 |
- # comment out sanity test until it is fixed to work |
| 26 |
- # with the new PORTAGE_PYM_PATH |
| 27 |
- #if [[ $ROOT == / ]] ; then |
| 28 |
- ## Run some minimal tests as a sanity check. |
| 29 |
- #local test_runner=$(find "${ED}" -name runTests) |
| 30 |
- #if [[ -n $test_runner && -x $test_runner ]] ; then |
| 31 |
- #einfo "Running preinst sanity tests..." |
| 32 |
- #"$test_runner" || die "preinst sanity tests failed" |
| 33 |
- #fi |
| 34 |
- #fi |
| 35 |
+ python_setup |
| 36 |
+ python_export PYTHON_SITEDIR |
| 37 |
+ env -u DISTDIR \ |
| 38 |
+ -u PORTAGE_OVERRIDE_EPREFIX \ |
| 39 |
+ -u PORTAGE_REPOSITORIES \ |
| 40 |
+ -u PORTDIR \ |
| 41 |
+ -u PORTDIR_OVERLAY \ |
| 42 |
+ PYTHONPATH="${ED%/}${PYTHON_SITEDIR}${PYTHONPATH:+:${PYTHONPATH}}" \ |
| 43 |
+ "${PYTHON}" -m portage._compat_upgrade.default_locations || die |
| 44 |
|
| 45 |
# elog dir must exist to avoid logrotate error for bug #415911. |
| 46 |
# This code runs in preinst in order to bypass the mapping of |
Archives