From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 1 Nov 2008 23:02:55 +0000 (-0000)
Subject: In config.setcpv(), ensure that A and AA aren't in the env dict.
X-Git-Tag: v2.2_rc13~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c24543fe6001892be679dfd8ca33c843ed6fa349;p=portage.git

In config.setcpv(), ensure that A and AA aren't in the env dict.

svn path=/main/trunk/; revision=11790
---

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 2a0cc4075..eff5c0711 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -1949,7 +1949,7 @@ class config(object):
 		env_configdict = self.configdict["env"]
 		pkg_configdict = self.configdict["pkg"]
 		previous_iuse = pkg_configdict.get("IUSE")
-		for k in ("CATEGORY", "PKGUSE", "PF", "PORTAGE_USE"):
+		for k in ("A", "AA", "CATEGORY", "PKGUSE", "PF", "PORTAGE_USE"):
 			env_configdict.pop(k, None)
 		pkg_configdict["CATEGORY"] = cat
 		pkg_configdict["PF"] = pf