Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/portage/
Date: Sat, 27 Feb 2021 01:34:24
Message-Id: 1614389494.fb12ab9a3e772907bea5f5827936b5f03aec57a6.zmedico@gentoo
1 commit: fb12ab9a3e772907bea5f5827936b5f03aec57a6
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Sat Feb 27 01:31:17 2021 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 27 01:31:34 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb12ab9a
7
8 sys-apps/portage: make FEATURES=-binpkg-multi-instance sticky
9
10 Bug: https://bugs.gentoo.org/772785
11 Package-Manager: Portage-3.0.15, Repoman-3.0.2
12 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
13
14 sys-apps/portage/portage-9999.ebuild | 4 ++++
15 1 file changed, 4 insertions(+)
16
17 diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
18 index cbe56d13e92..f229af539a2 100644
19 --- a/sys-apps/portage/portage-9999.ebuild
20 +++ b/sys-apps/portage/portage-9999.ebuild
21 @@ -238,6 +238,10 @@ pkg_preinst() {
22 PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
23 "${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
24
25 + env -u FEATURES -u PORTAGE_REPOSITORIES \
26 + PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
27 + "${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die
28 +
29 # elog dir must exist to avoid logrotate error for bug #415911.
30 # This code runs in preinst in order to bypass the mapping of
31 # portage:portage to root:root which happens after src_install.