summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-06-20 23:42:31 +0000
committerZac Medico <zmedico@gentoo.org>2009-06-20 23:42:31 +0000
commit518f9eb3a9753ac128caf5b2ea093abe2c614242 (patch)
tree5e00e9def5f72e5b2c47b959375a0013102853b3
parent650b2ff6ab0b2d92e41623d4d508f5378764b737 (diff)
downloadportage-518f9eb3a9753ac128caf5b2ea093abe2c614242.tar.gz
portage-518f9eb3a9753ac128caf5b2ea093abe2c614242.tar.bz2
portage-518f9eb3a9753ac128caf5b2ea093abe2c614242.zip
In doebuild_environment, ensure that cached $KV from the backupenv does not
leak into the environment for EAPI >= 3. svn path=/main/trunk/; revision=13658
-rw-r--r--pym/portage/__init__.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 1e2c9ceeb..f73d0cbb6 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -5428,6 +5428,8 @@ 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 = []