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

Add CATEGORY to blacklisted variables since it can interfere with CATEGORY guessing inside doebuild. (trunk r6385:6386)

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

diff --git a/pym/portage.py b/pym/portage.py
index 23e70e49c..1fe608a28 100644
--- 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: