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 68BAE138334 for ; Wed, 14 Aug 2019 01:40:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 70A8FE0536; Wed, 14 Aug 2019 01:40:48 +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 54486E0536 for ; Wed, 14 Aug 2019 01:40:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 CA281349AB2 for ; Wed, 14 Aug 2019 01:40:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9EFC9757 for ; Wed, 14 Aug 2019 01:40:44 +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: <1565746178.f28d32f298d4b089a2e36bebca2a55b6aeabe2a3.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/package/ebuild/ X-VCS-Repository: proj/portage X-VCS-Files: lib/portage/package/ebuild/config.py X-VCS-Directories: lib/portage/package/ebuild/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: f28d32f298d4b089a2e36bebca2a55b6aeabe2a3 X-VCS-Branch: master Date: Wed, 14 Aug 2019 01:40:44 +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: 3a63d216-5056-4c9b-8bc6-0ee34ddde77f X-Archives-Hash: cd401b1663a71a9f822456d8bf660dd3 commit: f28d32f298d4b089a2e36bebca2a55b6aeabe2a3 Author: Michał Górny gentoo org> AuthorDate: Sun Aug 11 13:51:35 2019 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Aug 14 01:29:38 2019 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=f28d32f2 Allow ESYSROOT and BROOT in the pkg_setup phase This follows a recent change to PMS. Signed-off-by: James Le Cuirot gentoo.org> Signed-off-by: Zac Medico gentoo.org> lib/portage/package/ebuild/config.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/portage/package/ebuild/config.py b/lib/portage/package/ebuild/config.py index 83a15b370..e0dda54d4 100644 --- a/lib/portage/package/ebuild/config.py +++ b/lib/portage/package/ebuild/config.py @@ -2820,12 +2820,13 @@ class config(object): if not eapi_exports_merge_type(eapi): mydict.pop("MERGE_TYPE", None) - src_phase = _phase_func_map.get(phase, '').startswith('src_') + src_like_phase = (phase == 'setup' or + _phase_func_map.get(phase, '').startswith('src_')) - if not (src_phase and eapi_attrs.sysroot): + if not (src_like_phase and eapi_attrs.sysroot): mydict.pop("ESYSROOT", None) - if not (src_phase and eapi_attrs.broot): + if not (src_like_phase and eapi_attrs.broot): mydict.pop("BROOT", None) # Prefix variables are supported beginning with EAPI 3, or when