From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 869E71382C5 for ; Sat, 27 Feb 2021 01:34:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C32FCE08A0; Sat, 27 Feb 2021 01:34:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A7CB3E08A0 for ; Sat, 27 Feb 2021 01:34:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4CCBD3410D3 for ; Sat, 27 Feb 2021 01:34:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 824E02A9 for ; Sat, 27 Feb 2021 01:34:20 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1614389494.fb12ab9a3e772907bea5f5827936b5f03aec57a6.zmedico@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/portage/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/portage/portage-9999.ebuild X-VCS-Directories: sys-apps/portage/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: fb12ab9a3e772907bea5f5827936b5f03aec57a6 X-VCS-Branch: master Date: Sat, 27 Feb 2021 01:34:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: cbc5eae8-2350-4711-9dcb-f6ed3aad90e1 X-Archives-Hash: 924b0ccd1d9ac536d369fda3f686dc52 commit: fb12ab9a3e772907bea5f5827936b5f03aec57a6 Author: Zac Medico gentoo org> AuthorDate: Sat Feb 27 01:31:17 2021 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Feb 27 01:31:34 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb12ab9a sys-apps/portage: make FEATURES=-binpkg-multi-instance sticky Bug: https://bugs.gentoo.org/772785 Package-Manager: Portage-3.0.15, Repoman-3.0.2 Signed-off-by: Zac Medico gentoo.org> sys-apps/portage/portage-9999.ebuild | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild index cbe56d13e92..f229af539a2 100644 --- a/sys-apps/portage/portage-9999.ebuild +++ b/sys-apps/portage/portage-9999.ebuild @@ -238,6 +238,10 @@ pkg_preinst() { PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ "${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die + env -u FEATURES -u PORTAGE_REPOSITORIES \ + PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ + "${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die + # elog dir must exist to avoid logrotate error for bug #415911. # This code runs in preinst in order to bypass the mapping of # portage:portage to root:root which happens after src_install.