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 1S6O8S-000355-RV for garchives@archives.gentoo.org; Sat, 10 Mar 2012 15:23:09 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E405DE0728; Sat, 10 Mar 2012 15:22:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B2823E0728 for ; Sat, 10 Mar 2012 15:22:59 +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 ED1CC1B400B for ; Sat, 10 Mar 2012 15:22:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id AE404E5428 for ; Sat, 10 Mar 2012 15:22:57 +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: <1331392966.9c6fec67d0097ab577eaaa718cfe6e2f9f1d2f97.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: 9c6fec67d0097ab577eaaa718cfe6e2f9f1d2f97 X-VCS-Branch: master Date: Sat, 10 Mar 2012 15:22:57 +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: dbef8c2c-3a50-4009-9380-f5e7ccdb0063 X-Archives-Hash: cf42db97c97cc60d00c9653145cbcacc commit: 9c6fec67d0097ab577eaaa718cfe6e2f9f1d2f97 Author: Zac Medico gentoo org> AuthorDate: Sat Mar 10 15:22:46 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Mar 10 15:22:46 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D9c6fec67 ebuild.sh: skip EBUILD_HOOK_DIR for depend phase --- bin/ebuild.sh | 40 +++++++++++++++++++++++++--------------- 1 files changed, 25 insertions(+), 15 deletions(-) diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 74c4f69..04ca1a0 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -375,24 +375,34 @@ source_all_bashrcs() { for x in "${path_array[@]}" ; do [ -f "$x/profile.bashrc" ] && qa_source "$x/profile.bashrc" done - fi =20 - # We assume if people are changing shopts in their bashrc they do so at= their - # own peril. This is the ONLY non-portage bit of code that can change = shopts - # without a QA violation. - for x in "${PORTAGE_BASHRC}" "${PM_EBUILD_HOOK_DIR}"/${CATEGORY}/{${PN}= ,${PN}:${SLOT},${P},${PF}}; do - if [ -r "${x}" ]; then - # If $- contains x, then tracing has already enabled elsewhere for so= me - # reason. We preserve it's state so as not to interfere. - if [ "$PORTAGE_DEBUG" !=3D "1" ] || [ "${-/x/}" !=3D "$-" ]; then - source "${x}" - else - set -x - source "${x}" - set +x + # The user's bashrc is the ONLY non-portage bit of code that can + # change shopts without a QA violation. + for x in "${PM_EBUILD_HOOK_DIR}"/${CATEGORY}/{${PN},${PN}:${SLOT},${P}= ,${PF}}; do + if [ -r "${x}" ]; then + # If $- contains x, then tracing has already been enabled + # elsewhere for some reason. We preserve it's state so as + # not to interfere. + if [ "$PORTAGE_DEBUG" !=3D "1" ] || [ "${-/x/}" !=3D "$-" ]; then + source "${x}" + else + set -x + source "${x}" + set +x + fi fi + done + fi + + if [ -r "${PORTAGE_BASHRC}" ] ; then + if [ "$PORTAGE_DEBUG" !=3D "1" ] || [ "${-/x/}" !=3D "$-" ]; then + source "${x}" + else + set -x + source "${x}" + set +x fi - done + fi =20 [ ! -z "${OCC}" ] && export CC=3D"${OCC}" [ ! -z "${OCXX}" ] && export CXX=3D"${OCXX}"