From b13416933b67988130b92f0a554e639cbf03e493 Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 25 Nov 2007 06:26:29 +0000
Subject: Implement loading of environment.bz2 for the pkg_info() phase. Since
 a temporary directory is required for processing of ${T}/environment, and we
 want a user who's not in the portage group to be able to run the pkg_info()
 phase, PORTAGE_TMPDIR is temporarily overridden with a directory created by
 mkdtemp. To make this work, doebuild() creates the tempdir and cleans it up
 in a finally block.

svn path=/main/trunk/; revision=8649
---
 bin/ebuild.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'bin')

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index bd01b4750..c28312ec6 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1601,7 +1601,8 @@ if hasq "depend" "${EBUILD_SH_ARGS}"; then
 	unset BIN_PATH BIN BODY FUNC_SRC
 fi
 
-if hasq ${EBUILD_PHASE} setup prerm && [ ! -f "${T}/environment" ]; then
+if hasq ${EBUILD_PHASE} info prerm setup \
+	&& [ ! -f "${T}/environment" ] ; then
 	bzip2 -dc "${EBUILD%/*}"/environment.bz2 > \
 		"${T}/environment" 2> /dev/null
 	if [ -s "${T}/environment" ] ; then
-- 
cgit v1.2.3-1-g7c22