summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-11-01 23:02:55 +0000
committerZac Medico <zmedico@gentoo.org>2008-11-01 23:02:55 +0000
commitc24543fe6001892be679dfd8ca33c843ed6fa349 (patch)
tree1d967f2b4e5f22e3af5895b9394a3b0481cf9409
parentc66c1f068092e21e36f5c82c2d45cba2bc581a49 (diff)
downloadportage-c24543fe6001892be679dfd8ca33c843ed6fa349.tar.gz
portage-c24543fe6001892be679dfd8ca33c843ed6fa349.tar.bz2
portage-c24543fe6001892be679dfd8ca33c843ed6fa349.zip
In config.setcpv(), ensure that A and AA aren't in the env dict.
svn path=/main/trunk/; revision=11790
-rw-r--r--pym/portage/__init__.py2
1 files changed, 1 insertions, 1 deletions
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