Use reset instead of regenerate (revert part of the previous commit) in order to...

svn path=/main/trunk/; revision=4787

diff --git a/pym/portage.py b/pym/portage.py
index 5f5310715ec070eb84a3c03c7ae4d16dd4f5641a..86a998c64988a8ded0a59868f43a5eaa1fa43732 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -2588,12 +2588,12 @@ def doebuild_environment(myebuild, mydo, myroot, mysettings, debug, use_cache, m
                        "Invalid ebuild path: '%s'" % myebuild)
 
        if mydo != "depend":
-               mysettings.setcpv(mycpv, use_cache=use_cache, mydb=mydbapi)
-               """For performance reasons, setcpv only triggers regenerate when it
+               """For performance reasons, setcpv only triggers reset when it
                detects a package-specific change in config.  For the ebuild
-               environment, a regenerate call is forced in order to ensure that the
+               environment, a reset call is forced in order to ensure that the
                latest env.d variables are used."""
-               mysettings.regenerate()
+               mysettings.reset(use_cache=use_cache)
+               mysettings.setcpv(mycpv, use_cache=use_cache, mydb=mydbapi)
 
        mysettings["EBUILD_PHASE"] = mydo