From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-847361-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id C04721384B4
	for <garchives@archives.gentoo.org>; Wed, 18 Nov 2015 16:57:37 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 502F8E07FC;
	Wed, 18 Nov 2015 16:57:37 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id EE68EE07FC
	for <gentoo-commits@lists.gentoo.org>; Wed, 18 Nov 2015 16:57:36 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 05429340901
	for <gentoo-commits@lists.gentoo.org>; Wed, 18 Nov 2015 16:57:36 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 1D3A3A7F
	for <gentoo-commits@lists.gentoo.org>; Wed, 18 Nov 2015 16:57:30 +0000 (UTC)
From: "Zac Medico" <zmedico@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" <zmedico@gentoo.org>
Message-ID: <1447865769.b01522a217a90850fd2a42d304708e468c9d065f.zmedico@gentoo>
Subject: [gentoo-commits] proj/portage:master commit in: bin/
X-VCS-Repository: proj/portage
X-VCS-Files: bin/phase-helpers.sh
X-VCS-Directories: bin/
X-VCS-Committer: zmedico
X-VCS-Committer-Name: Zac Medico
X-VCS-Revision: b01522a217a90850fd2a42d304708e468c9d065f
X-VCS-Branch: master
Date: Wed, 18 Nov 2015 16:57:30 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 23a8ad4e-eca2-46e5-a73d-4387cdf4bb71
X-Archives-Hash: dd9ebc5050284dc863a2cd20668ecb55

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