| 1 |
Author: zmedico |
| 2 |
Date: 2009-06-22 04:12:26 +0000 (Mon, 22 Jun 2009) |
| 3 |
New Revision: 13661 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/__init__.py |
| 7 |
Log: |
| 8 |
Reorganize $KV logic in doebuild_environment. |
| 9 |
|
| 10 |
|
| 11 |
Modified: main/trunk/pym/portage/__init__.py |
| 12 |
=================================================================== |
| 13 |
--- main/trunk/pym/portage/__init__.py 2009-06-21 22:01:50 UTC (rev 13660) |
| 14 |
+++ main/trunk/pym/portage/__init__.py 2009-06-22 04:12:26 UTC (rev 13661) |
| 15 |
@@ -5417,7 +5417,11 @@ |
| 16 |
mysettings["PORTAGE_BUILDDIR"], ".exit_status") |
| 17 |
|
| 18 |
#set up KV variable -- DEP SPEEDUP :: Don't waste time. Keep var persistent. |
| 19 |
- if eapi in ("0", "1", "2") and mydo != 'depend' and 'KV' not in mysettings and \ |
| 20 |
+ if eapi not in ('0', '1', '2'): |
| 21 |
+ # Discard KV for EAPIs that don't support it. Cache KV is restored |
| 22 |
+ # from the backupenv whenever config.reset() is called. |
| 23 |
+ mysettings.pop('KV', None) |
| 24 |
+ elif mydo != 'depend' and 'KV' not in mysettings and \ |
| 25 |
mydo in ('compile', 'config', 'configure', 'info', |
| 26 |
'install', 'nofetch', 'postinst', 'postrm', 'preinst', |
| 27 |
'prepare', 'prerm', 'setup', 'test', 'unpack'): |
| 28 |
@@ -5428,8 +5432,6 @@ |
| 29 |
else: |
| 30 |
mysettings["KV"]="" |
| 31 |
mysettings.backup_changes("KV") |
| 32 |
- elif eapi not in ("0", "1", "2"): |
| 33 |
- mysettings.pop("KV", None) |
| 34 |
|
| 35 |
# Allow color.map to control colors associated with einfo, ewarn, etc... |
| 36 |
mycolors = [] |
Archives