Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r13658 - main/trunk/pym/portage
Date: Sat, 20 Jun 2009 23:42:33
Message-Id: E1MIACe-0004pu-6V@stork.gentoo.org
1 Author: zmedico
2 Date: 2009-06-20 23:42:31 +0000 (Sat, 20 Jun 2009)
3 New Revision: 13658
4
5 Modified:
6 main/trunk/pym/portage/__init__.py
7 Log:
8 In doebuild_environment, ensure that cached $KV from the backupenv does not
9 leak into the environment for EAPI >= 3.
10
11
12 Modified: main/trunk/pym/portage/__init__.py
13 ===================================================================
14 --- main/trunk/pym/portage/__init__.py 2009-06-20 19:16:51 UTC (rev 13657)
15 +++ main/trunk/pym/portage/__init__.py 2009-06-20 23:42:31 UTC (rev 13658)
16 @@ -5428,6 +5428,8 @@
17 else:
18 mysettings["KV"]=""
19 mysettings.backup_changes("KV")
20 + elif eapi not in ("0", "1", "2"):
21 + mysettings.pop("KV", None)
22
23 # Allow color.map to control colors associated with einfo, ewarn, etc...
24 mycolors = []