aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2010-01-17 13:19:41 +0000
committerAvatar David Leverton <levertond@googlemail.com> 2010-01-17 13:19:41 +0000
commitfd4db6428fa0f03f845afb462704e76eab2a637b (patch)
treed739e8e3cffba42241acb0f8056c793b312f544e
parent2a0d18de8634326ad977d714003c5d24593c84b7 (diff)
downloadpaludis-fd4db6428fa0f03f845afb462704e76eab2a637b.tar.gz
paludis-fd4db6428fa0f03f845afb462704e76eab2a637b.tar.xz
Fix -*
-rw-r--r--paludis/paludislike_options_conf.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/paludis/paludislike_options_conf.cc b/paludis/paludislike_options_conf.cc
index 0c1ec2b..7c3a739 100644
--- a/paludis/paludislike_options_conf.cc
+++ b/paludis/paludislike_options_conf.cc
@@ -497,7 +497,7 @@ PaludisLikeOptionsConf::want_choice_enabled_locked(
}
/* Any set matches? */
- if (maybe_id)
+ if (maybe_id && ! seen_minus_star)
{
for (SetNamesWithValuesGroups::const_iterator r(_imp->set_specs.begin()), r_end(_imp->set_specs.end()) ;
r != r_end ; ++r)
@@ -515,6 +515,7 @@ PaludisLikeOptionsConf::want_choice_enabled_locked(
}
/* Wildcards? */
+ if (! seen_minus_star)
{
check_specs_with_values_groups(_imp->params.environment(), maybe_id, prefix, unprefixed_name,
_imp->wildcard_specs, seen_minus_star, result, dummy);