From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 1 Dec 2007 00:25:53 +0000 (-0000)
Subject: In doebuild_environment(), fix KV logic so that it never
X-Git-Tag: v2.2_pre1~262
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a8da09f525b49ac9e4a584331c90987a400aff7a;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.

svn path=/main/trunk/; revision=8771
---

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 8196526b1..6606fe8fc 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -3832,13 +3832,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 = []