aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2015-11-17 23:20:17 +0100
committerMichał Górny <mgorny@gentoo.org>2015-11-17 23:20:17 +0100
commit4a9fb374532ca70035fab163afd24769d01d6bcb (patch)
tree14dd5e62b15386f20f2d791849b8a6216a9d3e78
parentUpdates for a release (diff)
downloadportage-4a9fb374532ca70035fab163afd24769d01d6bcb.tar.gz
portage-4a9fb374532ca70035fab163afd24769d01d6bcb.tar.bz2
portage-4a9fb374532ca70035fab163afd24769d01d6bcb.zip
EAPI 6: Fail if eapply_user is not called in src_prepare()
-rw-r--r--bin/phase-functions.sh6
-rw-r--r--bin/phase-helpers.sh1
2 files changed, 7 insertions, 0 deletions
diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
index 7bf4d6336..abbc6029a 100644
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@ -374,6 +374,12 @@ __dyn_prepare() {
__ebuild_phase pre_src_prepare
__vecho ">>> Preparing source in $PWD ..."
__ebuild_phase src_prepare
+
+ # keep path in eapply_user in sync!
+ if [[ ! -f ${T}/.portage_user_patches_applied ]]; then
+ die "eapply_user (or default) must be called in src_prepare()!"
+ fi
+
>> "$PORTAGE_BUILDDIR/.prepared" || \
die "Failed to create $PORTAGE_BUILDDIR/.prepared"
__vecho ">>> Source prepared."
diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
index 6c45c2527..da9aa7c55 100644
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@ -1079,6 +1079,7 @@ fi
if ___eapi_has_eapply_user; then
eapply_user() {
+ # keep path in __dyn_prepare in sync!
local tagfile=${T}/.portage_user_patches_applied
[[ -f ${tagfile} ]] && return
>> "${tagfile}"