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

svn path=/main/branches/2.1.2/; revision=6387

diff --git a/pym/portage.py b/pym/portage.py
index 23e70e49c5749d286005673a986cc31e075701ec..1fe608a2867b9e2ed6cdb9d5bb92c891831a7664 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -1245,12 +1245,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: