Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: bin/
Date: Sun, 02 Sep 2012 02:25:10
Message-Id: 1346552686.9b3549dbfccad30a09c4564587a42f1027b4c676.zmedico@gentoo
1 commit: 9b3549dbfccad30a09c4564587a42f1027b4c676
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Sun Sep 2 02:24:46 2012 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 2 02:24:46 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=9b3549db
7
8 apply_user_patches: die if EBUILD_PHASE is wrong
9
10 ---
11 bin/phase-helpers.sh | 2 ++
12 1 files changed, 2 insertions(+), 0 deletions(-)
13
14 diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
15 index f23abdf..46f7132 100644
16 --- a/bin/phase-helpers.sh
17 +++ b/bin/phase-helpers.sh
18 @@ -639,6 +639,8 @@ apply_user_patches() {
19 }
20
21 _eapi5_apply_user_patches() {
22 + [[ ${EBUILD_PHASE} == prepare ]] || \
23 + die "apply_user_patches may only be called during src_prepare"
24 # This is a no-op that is just enough to fullfill the spec.
25 [[ -f ${PORTAGE_BUILDDIR}/.apply_user_patches ]] && return 1
26 > "${PORTAGE_BUILDDIR}/.apply_user_patches" || die