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 20804138010 for ; Thu, 4 Oct 2012 22:18:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4E841E056C; Thu, 4 Oct 2012 22:18:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id CAB83E056C for ; Thu, 4 Oct 2012 22:18:16 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 074FD33C1F2 for ; Thu, 4 Oct 2012 22:18:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 87305E5436 for ; Thu, 4 Oct 2012 22:18:13 +0000 (UTC) From: "Zac Medico" 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" Message-ID: <1349389077.8e5dcfaf9c57da3be20ae673f65c3b5b8d9827c2.zmedico@gentoo> 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: 8e5dcfaf9c57da3be20ae673f65c3b5b8d9827c2 X-VCS-Branch: master Date: Thu, 4 Oct 2012 22:18:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 92453e50-1386-43ce-a086-94e1799d25ea X-Archives-Hash: cd34625d08683778b521b7b9efd3ede0 commit: 8e5dcfaf9c57da3be20ae673f65c3b5b8d9827c2 Author: Zac Medico gentoo org> AuthorDate: Thu Oct 4 22:17:57 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Oct 4 22:17:57 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=8e5dcfaf ebuild.sh: comment on noauto behavior --- bin/ebuild.sh | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/bin/ebuild.sh b/bin/ebuild.sh index a74a848..de54e22 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -520,10 +520,12 @@ if ___eapi_enables_globstar; then shopt -s globstar fi +# Source the ebuild every time for FEATURES=noauto, so that ebuild +# modifications take effect immediately. if ! has "$EBUILD_PHASE" clean cleanrm ; then if [[ $EBUILD_PHASE = depend || ! -f $T/environment || \ - -f $PORTAGE_BUILDDIR/.ebuild_changed ]] || \ - has noauto $FEATURES ; then + -f $PORTAGE_BUILDDIR/.ebuild_changed || \ + " ${FEATURES} " == *" noauto "* ]] ; then # The bashrcs get an opportunity here to set aliases that will be expanded # during sourcing of ebuilds and eclasses. __source_all_bashrcs