From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A15291384B4 for ; Tue, 17 Nov 2015 23:32:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 348AEE0855; Tue, 17 Nov 2015 23:32:41 +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 98CB5E0826 for ; Tue, 17 Nov 2015 23:32:39 +0000 (UTC) Received: from [10.128.12.146] (unknown [100.42.98.196]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: zmedico) by smtp.gentoo.org (Postfix) with ESMTPSA id B63B83408E5; Tue, 17 Nov 2015 23:32:33 +0000 (UTC) Subject: Re: [gentoo-portage-dev] [PATCH] EAPI 6: Fail if eapply_user is not called in src_prepare() To: gentoo-portage-dev@lists.gentoo.org References: <1447798842-5013-1-git-send-email-mgorny@gentoo.org> Cc: =?UTF-8?B?TWljaGHFgiBHw7Nybnk=?= From: Zac Medico Message-ID: <564BB90F.1030308@gentoo.org> Date: Tue, 17 Nov 2015 15:32:31 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-portage-dev@lists.gentoo.org Reply-to: gentoo-portage-dev@lists.gentoo.org MIME-Version: 1.0 In-Reply-To: <1447798842-5013-1-git-send-email-mgorny@gentoo.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Archives-Salt: 6e8ad96f-6871-431e-9595-baf47120e339 X-Archives-Hash: 44c83a8473c9151c19565788df23c376 On 11/17/2015 02:20 PM, Michał Górny wrote: > --- > bin/phase-functions.sh | 6 ++++++ > bin/phase-helpers.sh | 1 + > 2 files changed, 7 insertions(+) > > diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh > index 7bf4d63..abbc602 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 6c45c25..da9aa7c 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}" > Looks good. I guess we better get this in a release soonish, before we have a bunch of EAPI 6 ebuilds that forget to call eapply_user. -- Thanks, Zac