[gentoo-commits] proj/portage:master commit in: bin/

[Zac Medico]

commit:     b01522a217a90850fd2a42d304708e468c9d065f
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 07:59:40 2015 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Nov 18 16:56:09 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=b01522a2

eapply_user: die if current phase is not src_prepare

 bin/phase-helpers.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
index da9aa7c..f42f805 100644
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@ -1079,6 +1079,8 @@ fi
 
 if ___eapi_has_eapply_user; then
        eapply_user() {
+               [[ ${EBUILD_PHASE} == prepare ]] || \
+                       die "eapply_user() called during invalid phase: 
${EBUILD_PHASE}"
                # keep path in __dyn_prepare in sync!
                local tagfile=${T}/.portage_user_patches_applied
                [[ -f ${tagfile} ]] && return