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