From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 13 Apr 2007 05:10:26 +0000 (-0000)
Subject: Add CATEGORY to blacklisted variables since it can interfere with CATEGORY guessing... 
X-Git-Tag: v2.2_pre1~1493
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=aa6708d79d29b571645457d4a00ad63680e91e45;p=portage.git

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

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

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: