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 1Qwcx4-0004Lq-7S for garchives@archives.gentoo.org; Thu, 25 Aug 2011 16:38:46 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E801C21C030; Thu, 25 Aug 2011 16:38:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 9261B21C030 for ; Thu, 25 Aug 2011 16:38:37 +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 D431D1B400A for ; Thu, 25 Aug 2011 16:38:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id CF43E80040 for ; Thu, 25 Aug 2011 16:38:35 +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: <5970a41fc60fef89fd4b1bbe45a6c108452b267f.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/isolated-functions.sh X-VCS-Directories: bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 5970a41fc60fef89fd4b1bbe45a6c108452b267f Date: Thu, 25 Aug 2011 16:38:35 +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: 5467d0ac034d4cb93d9e882941b33799 commit: 5970a41fc60fef89fd4b1bbe45a6c108452b267f Author: Zac Medico gentoo org> AuthorDate: Thu Aug 25 16:37:11 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Aug 25 16:37:11 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D5970a41f die: defer die hooks for EAPI 4 helpers_die This will fix bug #380625. --- bin/isolated-functions.sh | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh index 65bb1d5..1de1f7f 100644 --- a/bin/isolated-functions.sh +++ b/bin/isolated-functions.sh @@ -203,7 +203,12 @@ die() { fi fi =20 - if [[ "${EBUILD_PHASE/depend}" =3D=3D "${EBUILD_PHASE}" ]] ; then + # Only call die hooks here if we are executed via ebuild.sh or + # misc-functions.sh, since those are the only cases where the environme= nt + # contains the hook functions. When necessary (like for helpers_die), d= ie + # hooks are automatically called later by a misc-functions.sh invocatio= n. + if has ${BASH_SOURCE[$main_index]##*/} ebuild.sh misc-functions.sh && \ + [[ ${EBUILD_PHASE} !=3D depend ]] ; then local x for x in $EBUILD_DEATH_HOOKS; do ${x} "$@" >&2 1>&2