diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-11-25 06:56:02 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-11-25 06:56:02 +0000 |
| commit | d952f5251f5033a57d95425df7c570b72821033f (patch) | |
| tree | 2fdf93303315623371349b40687b926e4b6834c5 | |
| parent | b13416933b67988130b92f0a554e639cbf03e493 (diff) | |
| download | portage-d952f5251f5033a57d95425df7c570b72821033f.tar.gz portage-d952f5251f5033a57d95425df7c570b72821033f.tar.bz2 portage-d952f5251f5033a57d95425df7c570b72821033f.zip | |
* Load environment.bz2 for the pkg_config() phase.
* Run the "clean" phase if pkg_config() succeeds.
svn path=/main/trunk/; revision=8651
| -rwxr-xr-x | bin/ebuild.sh | 2 | ||||
| -rw-r--r-- | pym/_emerge/__init__.py | 8 |
2 files changed, 8 insertions, 2 deletions
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/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 8223b2a76..de142a414 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -5757,9 +5757,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): |