diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-12-01 00:25:53 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-12-01 00:25:53 +0000 |
| commit | a8da09f525b49ac9e4a584331c90987a400aff7a (patch) | |
| tree | 5fdaf599a2152e12ddec05267736f4d6745b9508 /pym | |
| parent | f8c681167414ff98accf51977a3bba21e0af9577 (diff) | |
| download | portage-a8da09f525b49ac9e4a584331c90987a400aff7a.tar.gz portage-a8da09f525b49ac9e4a584331c90987a400aff7a.tar.bz2 portage-a8da09f525b49ac9e4a584331c90987a400aff7a.zip | |
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
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
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 = [] |