Gentoo Archives: gentoo-portage-dev

From:	Zac Medico <zmedico@g.o>
To:	gentoo-portage-dev@l.g.o
Cc:	"Michał Górny" <mgorny@g.o>
Subject:	Re: [gentoo-portage-dev] [PATCH] src_prepare: Do not expect eapply_user in EAPIs not having it
Date:	Wed, 18 Nov 2015 16:45:04
Message-Id:	`564CAB07.3080909@gentoo.org`
In Reply to:	[gentoo-portage-dev] [PATCH] src_prepare: Do not expect eapply_user in EAPIs not having it by "Michał Górny"

1	On 11/18/2015 08:32 AM, Michał Górny wrote:
2	> ---
3	> bin/phase-functions.sh \| 2 +-
4	> 1 file changed, 1 insertion(+), 1 deletion(-)
5	>
6	> diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
7	> index abbc602..042e242 100644
8	> --- a/bin/phase-functions.sh
9	> +++ b/bin/phase-functions.sh
10	> @@ -376,7 +376,7 @@ __dyn_prepare() {
11	> __ebuild_phase src_prepare
12	>
13	> # keep path in eapply_user in sync!
14	> - if [[ ! -f ${T}/.portage_user_patches_applied ]]; then
15	> + if ___eapi_has_eapply_user && [[ ! -f ${T}/.portage_user_patches_applied ]]; then
16	> die "eapply_user (or default) must be called in src_prepare()!"
17	> fi
18	>
19	>
20
21	Looks good.
22	--
23	Thanks,
24	Zac