From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 1 Dec 2007 00:35:46 +0000 (-0000)
Subject: In doebuild_environment(), fix KV logic so that it
X-Git-Tag: v2.1.4~162
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4983cc2152b1daa5e5f773fdcf45d4aafd5d05ae;p=portage.git

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 478ec235d..db3a415ad 100644
--- 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 = []