diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-06-22 04:12:26 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-06-22 04:12:26 +0000 |
| commit | e478a44ddb7018fcbbaf93a42afd1c559d431b35 (patch) | |
| tree | c77f55e43402938d583a610c5b7dfdf69ffab3f0 | |
| parent | cb434991ee327850cfeae8fdfb64e7aafc32ab66 (diff) | |
| download | portage-e478a44ddb7018fcbbaf93a42afd1c559d431b35.tar.gz portage-e478a44ddb7018fcbbaf93a42afd1c559d431b35.tar.bz2 portage-e478a44ddb7018fcbbaf93a42afd1c559d431b35.zip | |
Reorganize $KV logic in doebuild_environment.
svn path=/main/trunk/; revision=13661
| -rw-r--r-- | pym/portage/__init__.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index f73d0cbb6..95741829a 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -5417,7 +5417,11 @@ 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 eapi in ("0", "1", "2") and mydo != 'depend' and 'KV' not in mysettings and \ + if eapi not in ('0', '1', '2'): + # Discard KV for EAPIs that don't support it. Cache KV is restored + # from the backupenv whenever config.reset() is called. + mysettings.pop('KV', None) + elif mydo != 'depend' and 'KV' not in mysettings and \ mydo in ('compile', 'config', 'configure', 'info', 'install', 'nofetch', 'postinst', 'postrm', 'preinst', 'prepare', 'prerm', 'setup', 'test', 'unpack'): @@ -5428,8 +5432,6 @@ def doebuild_environment(myebuild, mydo, myroot, mysettings, debug, use_cache, m else: mysettings["KV"]="" mysettings.backup_changes("KV") - elif eapi not in ("0", "1", "2"): - mysettings.pop("KV", None) # Allow color.map to control colors associated with einfo, ewarn, etc... mycolors = [] |