From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 25 Nov 2007 06:58:24 +0000 (-0000)
Subject: * Load environment.bz2 for the pkg_config() phase.
X-Git-Tag: v2.1.4~218
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ac8de8c5fa8c5172adc42eddae540665f9b2b1c4;p=portage.git

* Load environment.bz2 for the pkg_config() phase.
* Run the "clean" phase if pkg_config() succeeds.
(trunk r8651)

svn path=/main/branches/2.1.2/; revision=8652
---

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index c28312ec6..566ff8a85 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1601,7 +1601,7 @@ if hasq "depend" "${EBUILD_SH_ARGS}"; then
 	unset BIN_PATH BIN BODY FUNC_SRC
 fi
 
-if hasq ${EBUILD_PHASE} info prerm setup \
+if hasq ${EBUILD_PHASE} config info prerm setup \
 	&& [ ! -f "${T}/environment" ] ; then
 	bzip2 -dc "${EBUILD%/*}"/environment.bz2 > \
 		"${T}/environment" 2> /dev/null
diff --git a/bin/emerge b/bin/emerge
index ee5b64264..a527c26cc 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -5253,9 +5253,15 @@ def action_config(settings, trees, myopts, myfiles):
 	print
 	ebuildpath = trees[settings["ROOT"]]["vartree"].dbapi.findname(pkg)
 	mysettings = portage.config(clone=settings)
-	portage.doebuild(ebuildpath, "config", settings["ROOT"], mysettings,
+	vardb = trees[mysettings["ROOT"]]["vartree"].dbapi
+	debug = mysettings.get("PORTAGE_DEBUG") == "1"
+	retval = portage.doebuild(ebuildpath, "config", mysettings["ROOT"],
+		mysettings,
 		debug=(settings.get("PORTAGE_DEBUG", "") == 1), cleanup=True,
 		mydbapi=trees[settings["ROOT"]]["vartree"].dbapi, tree="vartree")
+	if retval == os.EX_OK:
+		portage.doebuild(ebuildpath, "clean", mysettings["ROOT"],
+			mysettings, debug=debug, mydbapi=vardb, tree="vartree")
 	print
 
 def action_info(settings, trees, myopts, myfiles):