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 2a0cc4075c63953814c200b10f03cf795011a274..eff5c0711e20f91e21017cb65efc8e792a5fde1f 100644 (file)
--- 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