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 84cf2e022d2989ca307927da1193cbc4183127af..2073f7fe602395aa1541a244babb0ed93a85fb65 100644 (file)
--- 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 \