In doebuild_environment(), fix KV logic so that it

never gets set during the "depend" phase. Also, use
backup_changes() to properly cache the result.
(trunk r8771)

svn path=/main/branches/2.1.2/; revision=8773

diff --git a/pym/portage.py b/pym/portage.py
index 478ec235d177635e7ee69410d47d100021c40729..db3a415ad8b473f2571d38b7a6c45a3f40a6183b 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -3817,13 +3817,14 @@ def doebuild_environment(myebuild, mydo, myroot, mysettings, debug, use_cache, m
                mysettings["PORTAGE_BUILDDIR"], ".exit_status")
 
        #set up KV variable -- DEP SPEEDUP :: Don't waste time. Keep var persistent.
-       if (mydo!="depend") or not mysettings.has_key("KV"):
+       if mydo != "depend" and "KV" not in mysettings:
                mykv,err1=ExtractKernelVersion(os.path.join(myroot, "usr/src/linux"))
                if mykv:
                        # Regular source tree
                        mysettings["KV"]=mykv
                else:
                        mysettings["KV"]=""
+               mysettings.backup_changes("KV")
 
        # Allow color.map to control colors associated with einfo, ewarn, etc...
        mycolors = []