summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-09-07 08:53:56 -0700
committerZac Medico <zmedico@gentoo.org>2010-09-07 08:53:56 -0700
commit8d0fe4331f68d78013638e62cc0b467322a275ef (patch)
tree32b75a6eb7300a66210857a8726bb2dd3e148b4f
parent62f8d9c4f3e8c87d17145b9b508843a6eef80b9c (diff)
downloadportage-8d0fe4331f68d78013638e62cc0b467322a275ef.tar.gz
portage-8d0fe4331f68d78013638e62cc0b467322a275ef.tar.bz2
portage-8d0fe4331f68d78013638e62cc0b467322a275ef.zip
Bug #336356 - Fix AttributeError triggered when ebuild(1) invokes the
test phase.
-rw-r--r--pym/portage/package/ebuild/config.py5
1 files changed, 3 insertions, 2 deletions
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 \