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 1R2uCf-0004H5-RV for garchives@archives.gentoo.org; Mon, 12 Sep 2011 00:16:50 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0BE4721C19B; Mon, 12 Sep 2011 00:16:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B189221C19B for ; Mon, 12 Sep 2011 00:16:39 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1D3521B4009 for ; Mon, 12 Sep 2011 00:16:39 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 40D6380042 for ; Mon, 12 Sep 2011 00:16:38 +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: bddd8215f278a61210a320bb05416020e28ac2c1 Date: Mon, 12 Sep 2011 00:16:38 +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: 07ddb17a64863fb5e6af1f526e3ba1c3 commit: bddd8215f278a61210a320bb05416020e28ac2c1 Author: Zac Medico gentoo org> AuthorDate: Mon Sep 12 00:16:26 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Sep 12 00:16:26 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dbddd8215 ebuild.sh: source *.sh at the top --- bin/ebuild.sh | 56 ++++++++++++++++++++++++++++-----------------------= ----- 1 files changed, 28 insertions(+), 28 deletions(-) diff --git a/bin/ebuild.sh b/bin/ebuild.sh index d722ccc..42616d0 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -5,6 +5,34 @@ PORTAGE_BIN_PATH=3D"${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}" PORTAGE_PYM_PATH=3D"${PORTAGE_PYM_PATH:-/usr/lib/portage/pym}" =20 +# Prevent aliases from causing portage to act inappropriately. +# Make sure it's before everything so we don't mess aliases that follow. +unalias -a + +source "${PORTAGE_BIN_PATH}/isolated-functions.sh" || exit 1 + +if [[ $EBUILD_PHASE !=3D depend ]] ; then + source "${PORTAGE_BIN_PATH}/phase-functions.sh" || die + source "${PORTAGE_BIN_PATH}/phase-helpers.sh" || die + source "${PORTAGE_BIN_PATH}/bashrc-functions.sh" || die +else + # These dummy functions are for things that are likely to be called + # in global scope, even though they are completely useless during + # the "depend" phase. + for x in diropts docompress exeopts insopts \ + keepdir libopts register_die_hook register_success_hook \ + remove_path_entry set_unless_changed strip_duplicate_slashes \ + unset_unless_changed use useq usev use_with use_enable ; do + eval "${x}() { : ; }" + done + # These functions die because calls to them during the "depend" phase + # are considered to be severe QA violations. + for x in best_version has_version portageq ; do + eval "${x}() { die \"\${FUNCNAME} calls are not allowed in global scop= e\"; }" + done + unset x +fi + if [[ $PORTAGE_SANDBOX_COMPAT_LEVEL -lt 22 ]] ; then # Ensure that /dev/std* streams have appropriate sandbox permission for # bug #288863. This can be removed after sandbox is fixed and portage @@ -67,15 +95,9 @@ EBUILD_SH_ARGS=3D"$*" =20 shift $# =20 -# Prevent aliases from causing portage to act inappropriately. -# Make sure it's before everything so we don't mess aliases that follow. -unalias -a - # Unset some variables that break things. unset GZIP BZIP BZIP2 CDPATH GREP_OPTIONS GREP_COLOR GLOBIGNORE =20 -source "${PORTAGE_BIN_PATH}/isolated-functions.sh" &>/dev/null - [[ $PORTAGE_QUIET !=3D "" ]] && export PORTAGE_QUIET =20 # sandbox support functions; defined prior to profile.bashrc srcing, sin= ce the profile might need to add a default exception (/usr/lib64/conftest= fex) @@ -434,28 +456,6 @@ fi export EBUILD_MASTER_PID=3D$BASHPID trap 'exit 1' SIGTERM =20 -if [[ $EBUILD_PHASE !=3D depend ]] ; then - source "${PORTAGE_BIN_PATH}/phase-functions.sh" - source "${PORTAGE_BIN_PATH}/phase-helpers.sh" - source "${PORTAGE_BIN_PATH}/bashrc-functions.sh" -else - # These dummy functions are for things that are likely to be called - # in global scope, even though they are completely useless during - # the "depend" phase. - for x in diropts docompress exeopts insopts \ - keepdir libopts register_die_hook register_success_hook \ - remove_path_entry set_unless_changed strip_duplicate_slashes \ - unset_unless_changed use useq usev use_with use_enable ; do - eval "${x}() { : ; }" - done - # These functions die because calls to them during the "depend" phase - # are considered to be severe QA violations. - for x in best_version has_version portageq ; do - eval "${x}() { die \"\${FUNCNAME} calls are not allowed in global scop= e\"; }" - done - unset x -fi - if ! has "$EBUILD_PHASE" clean cleanrm depend && \ [ -f "${T}"/environment ] ; then # The environment may have been extracted from environment.bz2 or