From aa6708d79d29b571645457d4a00ad63680e91e45 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 13 Apr 2007 05:10:26 +0000 Subject: [PATCH] Add CATEGORY to blacklisted variables since it can interfere with CATEGORY guessing inside doebuild. svn path=/main/trunk/; revision=6386 --- pym/portage/__init__.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index eab6fe5ba..85140d2ad 100644 --- 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: -- 2.26.2