Blacklist some variables in the config constructor so that they can't interfere with...

svn path=/main/trunk/; revision=3973

diff --git a/pym/portage.py b/pym/portage.py
index e3eed28ab6a10f74bd2cdd77769cc220980f3c5b..3659839b369ad07659e5600ac5dfaeedb062f27b 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -1076,6 +1076,15 @@ class config:
                        self.lookuplist=self.configlist[:]
                        self.lookuplist.reverse()
 
+                       # Blacklist vars that could interfere with portage internals.
+                       for blacklisted in ["PKGUSE", "PORTAGE_CONFIGROOT", "ROOT"]:
+                               for cfg in self.lookuplist:
+                                       try:
+                                               del cfg[blacklisted]
+                                       except KeyError:
+                                               pass
+                       del blacklisted, cfg
+
                        self["PORTAGE_CONFIGROOT"] = config_root
                        self.backup_changes("PORTAGE_CONFIGROOT")
                        self["ROOT"] = target_root
@@ -1462,10 +1471,6 @@ class config:
                                if not self.uvlist:
                                        for x in self["USE_ORDER"].split(":"):
                                                if x in self.configdict:
-                                                       try:
-                                                               del self.configdict[x]["PKGUSE"]
-                                                       except KeyError:
-                                                               pass
                                                        self.uvlist.insert(0, self.configdict[x])
                                mydbs=self.uvlist
                                if "auto" in self["USE_ORDER"].split(":"):