aboutsummaryrefslogtreecommitdiff
path: root/paludis/paludislike_options_conf.cc
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-04-04 08:19:18 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-04-04 08:33:00 +0100
commit6d8fa49055b5c43117d98c020187be9bfa4fb2c6 (patch)
tree1f8d90310bbac90838dce4f082fd4c8fa4e04942 /paludis/paludislike_options_conf.cc
parent508e7564e1d8d1de765d4d517bc899b7ef137716 (diff)
downloadpaludis-6d8fa49055b5c43117d98c020187be9bfa4fb2c6.tar.gz
paludis-6d8fa49055b5c43117d98c020187be9bfa4fb2c6.tar.xz
Use reqs to constraints
Diffstat (limited to 'paludis/paludislike_options_conf.cc')
-rw-r--r--paludis/paludislike_options_conf.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/paludis/paludislike_options_conf.cc b/paludis/paludislike_options_conf.cc
index 004a6e182..52b47d3f6 100644
--- a/paludis/paludislike_options_conf.cc
+++ b/paludis/paludislike_options_conf.cc
@@ -204,7 +204,7 @@ PaludisLikeOptionsConf::add_file(const FSPath & f)
tokens.at(0), _imp->params.environment(),
{ updso_allow_wildcards, updso_no_disambiguation, updso_throw_if_set })));
- if (d->additional_requirements_ptr())
+ if (d->all_choice_constraints() && ! d->all_choice_constraints()->empty())
{
Log::get_instance()->message("paludislike_options_conf.bad_spec", ll_warning, lc_context)
<< "Dependency specification '" << stringify(*d)
@@ -341,9 +341,9 @@ namespace
bool match_anything(const PackageDepSpec & spec)
{
return package_dep_spec_has_properties(spec, make_named_values<PackageDepSpecProperties>(
- n::has_additional_requirements() = false,
n::has_any_slot_requirement() = indeterminate,
n::has_category_name_part() = false,
+ n::has_choice_requirements() = false,
n::has_exact_slot_requirement() = false,
n::has_from_repository() = false,
n::has_in_repository() = false,