Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r11790 - main/trunk/pym/portage
Date: Sat, 01 Nov 2008 23:02:58
Message-Id: E1KwPUd-0004rq-Uj@stork.gentoo.org
1 Author: zmedico
2 Date: 2008-11-01 23:02:55 +0000 (Sat, 01 Nov 2008)
3 New Revision: 11790
4
5 Modified:
6 main/trunk/pym/portage/__init__.py
7 Log:
8 In config.setcpv(), ensure that A and AA aren't in the env dict.
9
10
11 Modified: main/trunk/pym/portage/__init__.py
12 ===================================================================
13 --- main/trunk/pym/portage/__init__.py 2008-11-01 22:59:01 UTC (rev 11789)
14 +++ main/trunk/pym/portage/__init__.py 2008-11-01 23:02:55 UTC (rev 11790)
15 @@ -1949,7 +1949,7 @@
16 env_configdict = self.configdict["env"]
17 pkg_configdict = self.configdict["pkg"]
18 previous_iuse = pkg_configdict.get("IUSE")
19 - for k in ("CATEGORY", "PKGUSE", "PF", "PORTAGE_USE"):
20 + for k in ("A", "AA", "CATEGORY", "PKGUSE", "PF", "PORTAGE_USE"):
21 env_configdict.pop(k, None)
22 pkg_configdict["CATEGORY"] = cat
23 pkg_configdict["PF"] = pf