Gentoo Archives: gentoo-portage-dev

From: Zac Medico <zmedico@g.o>
To: Zac Medico <zmedico@g.o>, gentoo-portage-dev@l.g.o
Subject: [gentoo-portage-dev] Re: [PATCH] eapply_user: die if current phase is not src_prepare
Date: Wed, 18 Nov 2015 17:01:57
Message-Id: 564CAEFC.4030202@gentoo.org
In Reply to: [gentoo-portage-dev] [PATCH] eapply_user: die if current phase is not src_prepare by Zac Medico
1 On 11/18/2015 12:01 AM, Zac Medico wrote:
2 > ---
3 > bin/phase-helpers.sh | 2 ++
4 > 1 file changed, 2 insertions(+)
5 >
6 > diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
7 > index da9aa7c..f42f805 100644
8 > --- a/bin/phase-helpers.sh
9 > +++ b/bin/phase-helpers.sh
10 > @@ -1079,6 +1079,8 @@ fi
11 >
12 > if ___eapi_has_eapply_user; then
13 > eapply_user() {
14 > + [[ ${EBUILD_PHASE} == prepare ]] || \
15 > + die "eapply_user() called during invalid phase: ${EBUILD_PHASE}"
16 > # keep path in __dyn_prepare in sync!
17 > local tagfile=${T}/.portage_user_patches_applied
18 > [[ -f ${tagfile} ]] && return
19 >
20
21 This is trivial, so I've pushed it.
22 --
23 Thanks,
24 Zac