Gentoo Archives: gentoo-portage-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-portage-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: [gentoo-portage-dev] [PATCH] src_prepare: Do not expect eapply_user in EAPIs not having it
Date: Wed, 18 Nov 2015 16:33:00
Message-Id: 1447864371-13827-1-git-send-email-mgorny@gentoo.org
1 ---
2 bin/phase-functions.sh | 2 +-
3 1 file changed, 1 insertion(+), 1 deletion(-)
4
5 diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
6 index abbc602..042e242 100644
7 --- a/bin/phase-functions.sh
8 +++ b/bin/phase-functions.sh
9 @@ -376,7 +376,7 @@ __dyn_prepare() {
10 __ebuild_phase src_prepare
11
12 # keep path in eapply_user in sync!
13 - if [[ ! -f ${T}/.portage_user_patches_applied ]]; then
14 + if ___eapi_has_eapply_user && [[ ! -f ${T}/.portage_user_patches_applied ]]; then
15 die "eapply_user (or default) must be called in src_prepare()!"
16 fi
17
18 --
19 2.6.3

Replies