diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-12-01 00:35:46 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-12-01 00:35:46 +0000 |
| commit | 4983cc2152b1daa5e5f773fdcf45d4aafd5d05ae (patch) | |
| tree | 40f78cf67581a105bd08d47a64109d9a488074de | |
| parent | 1bb3692747dfbd3b77ef7a9186b65426d58416f9 (diff) | |
| download | portage-4983cc2152b1daa5e5f773fdcf45d4aafd5d05ae.tar.gz portage-4983cc2152b1daa5e5f773fdcf45d4aafd5d05ae.tar.bz2 portage-4983cc2152b1daa5e5f773fdcf45d4aafd5d05ae.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.
(trunk r8771)
svn path=/main/branches/2.1.2/; revision=8773
| -rw-r--r-- | pym/portage.py | 3 |
1 files changed, 2 insertions, 1 deletions
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 = [] |