Add CATEGORY to blacklisted variables since it can interfere with CATEGORY guessing...

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

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index eab6fe5bad284188d150b85565326798c0880efc..85140d2ad987c7b6d3967e96da9492bc67095284 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -1162,12 +1162,10 @@ class config:
                        self.lookuplist.reverse()
 
                        # Blacklist vars that could interfere with portage internals.
-                       for blacklisted in ["PKGUSE", "PORTAGE_CONFIGROOT", "ROOT"]:
+                       for blacklisted in "CATEGORY", "PKGUSE", "PORTAGE_CONFIGROOT", \
+                               "ROOT":
                                for cfg in self.lookuplist:
-                                       try:
-                                               del cfg[blacklisted]
-                                       except KeyError:
-                                               pass
+                                       cfg.pop(blacklisted, None)
                        del blacklisted, cfg
 
                        if target_root is None: