From 8829466443c5bb58cc180331ae5586c94eef36d4 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 21 Oct 2006 23:40:13 +0000 Subject: [PATCH] Use reset instead of regenerate (revert part of the previous commit) in order to properly clear the env layer of the config. svn path=/main/trunk/; revision=4787 --- pym/portage.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pym/portage.py b/pym/portage.py index 5f5310715..86a998c64 100644 --- 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 -- 2.26.2