From: Jason Stubbs <jstubbs@gentoo.org>
Date: Tue, 13 Dec 2005 15:51:30 +0000 (-0000)
Subject: Prevent USE_EXPAND variables from bypassing use.mask
X-Git-Tag: v2.1_pre1~21
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=45fc459ab63251aac14162cbb9b783aafd711532;p=portage.git

Prevent USE_EXPAND variables from bypassing use.mask

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

diff --git a/pym/portage.py b/pym/portage.py
index d34c45bcf..d0734b458 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -1453,7 +1453,7 @@ class config:
 				if self.has_key(var):
 					for x in string.split(self[var]):
 						mystr = string.lower(var)+"_"+x
-						if mystr not in usesplit:
+						if mystr not in usesplit and mystr not in self.usemask:
 							usesplit.append(mystr)
 
 		# Pre-Pend ARCH variable to USE settings so '-*' in env doesn't kill arch.