From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 7 Sep 2010 15:53:56 +0000 (-0700)
Subject: Bug #336356 - Fix AttributeError triggered when ebuild(1) invokes the
X-Git-Tag: v2.2_rc78~32
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8d0fe4331f68d78013638e62cc0b467322a275ef;p=portage.git

Bug #336356 - Fix AttributeError triggered when ebuild(1) invokes the
test phase.
---

diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py
index 84cf2e022..2073f7fe6 100644
--- a/pym/portage/package/ebuild/config.py
+++ b/pym/portage/package/ebuild/config.py
@@ -1319,8 +1319,9 @@ class config(object):
 				use.discard("test")
 			else:
 				use.add("test")
-				if ebuild_force_test:
-					self.usemask.discard("test")
+				if ebuild_force_test and "test" in self.usemask:
+					self.usemask = \
+						frozenset(x for x in self.usemask if x != "test")
 
 		# Allow _* flags from USE_EXPAND wildcards to pass through here.
 		use.difference_update([x for x in use \