public inbox for gentoo-portage-dev@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-portage-dev] [PATCH] Allow ESYSROOT and BROOT in the pkg_setup phase
@ 2019-08-11 13:51 James Le Cuirot
  2019-08-14  1:42 ` Zac Medico
  0 siblings, 1 reply; 2+ messages in thread
From: James Le Cuirot @ 2019-08-11 13:51 UTC (permalink / raw
  To: gentoo-portage-dev; +Cc: Michał Górny, James Le Cuirot

From: Michał Górny <mgorny@gentoo.org>

This follows a recent change to PMS.

Signed-off-by: James Le Cuirot <chewi@gentoo.org>
---
 lib/portage/package/ebuild/config.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Sending this on behalf of mgorny as requested.

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
-- 
2.21.0



^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2019-08-14  1:42 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-08-11 13:51 [gentoo-portage-dev] [PATCH] Allow ESYSROOT and BROOT in the pkg_setup phase James Le Cuirot
2019-08-14  1:42 ` Zac Medico

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox