* 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 c28312ec6f35768fe96e3055a284aedba0cae48f..566ff8a8520146097eeb1c39e15155cd046ffc0d 100755 (executable)
--- 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 ee5b6426432580a4812f927fca449462a5eeb0d3..a527c26cc77664ba93c1c61097a92907dab5994b 100755 (executable)
--- 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):