From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QGxOE-0007R7-RS for garchives@archives.gentoo.org; Mon, 02 May 2011 17:58:35 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 99F8EE02CE; Mon, 2 May 2011 17:58:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 600B6E02CE for ; Mon, 2 May 2011 17:58:26 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DE9A21B405F for ; Mon, 2 May 2011 17:58:25 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id EAE0880505 for ; Mon, 2 May 2011 17:58:24 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/ebuild.sh X-VCS-Directories: bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: e5977579376dd124bb341263f73a5d302dbc0863 Date: Mon, 2 May 2011 17:58:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 2b0cf2ab049ac459e5ab8c71760c301f commit: e5977579376dd124bb341263f73a5d302dbc0863 Author: Zac Medico gentoo org> AuthorDate: Mon May 2 17:56:51 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon May 2 17:56:51 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3De5977579 ebuild.sh: make INHERITED independent of phase When EBUILD_PHASE !=3D depend, INHERITED comes pre-initialized from cache. In order to make INHERITED content independent of EBUILD_PHASE during inherit() calls, we unset INHERITED after we make a backup copy for QA checks. --- bin/ebuild.sh | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 6593755..b610342 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -1359,7 +1359,7 @@ inherit() { # This is disabled in the *rm phases because they frequently give # false alarms due to INHERITED in /var/db/pkg being outdated # in comparison the the eclasses from the portage tree. - if ! hasq $ECLASS $INHERITED; then + if ! hasq $ECLASS $INHERITED $__INHERITED_QA_CACHE ; then eqawarn "QA Notice: ECLASS '$ECLASS' inherited illegally in $CATEGOR= Y/$PF $EBUILD_PHASE" fi fi @@ -2023,11 +2023,18 @@ if ! hasq "$EBUILD_PHASE" clean cleanrm ; then # during sourcing of ebuilds and eclasses. source_all_bashrcs =20 + # When EBUILD_PHASE !=3D depend, INHERITED comes pre-initialized + # from cache. In order to make INHERITED content independent of + # EBUILD_PHASE during inherit() calls, we unset INHERITED after + # we make a backup copy for QA checks. + __INHERITED_QA_CACHE=3D$INHERITED + # *DEPEND and IUSE will be set during the sourcing of the ebuild. # In order to ensure correct interaction between ebuilds and # eclasses, they need to be unset before this process of # interaction begins. - unset DEPEND RDEPEND PDEPEND IUSE REQUIRED_USE + unset DEPEND RDEPEND PDEPEND INHERITED IUSE REQUIRED_USE \ + ECLASS E_IUSE E_REQUIRED_USE E_DEPEND E_RDEPEND E_PDEPEND =20 if [[ $PORTAGE_DEBUG !=3D 1 || ${-/x/} !=3D $- ]] ; then source "$EBUILD" || die "error sourcing ebuild" @@ -2057,7 +2064,8 @@ if ! hasq "$EBUILD_PHASE" clean cleanrm ; then PDEPEND=3D"${PDEPEND} ${E_PDEPEND}" REQUIRED_USE=3D"${REQUIRED_USE} ${E_REQUIRED_USE}" =09 - unset ECLASS E_IUSE E_REQUIRED_USE E_DEPEND E_RDEPEND E_PDEPEND=20 + unset ECLASS E_IUSE E_REQUIRED_USE E_DEPEND E_RDEPEND E_PDEPEND \ + __INHERITED_QA_CACHE =20 # alphabetically ordered by $EBUILD_PHASE value case "$EAPI" in