aboutsummaryrefslogtreecommitdiff
path: root/paludis/paludislike_options_conf.cc
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-04-18 20:10:45 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-04-18 20:10:45 +0100
commitbb06c0f5ac5e7fe01e5ab0a957bc310179eb5bab (patch)
treec929cf1b4e92d8d0ec0b63045dd260700f170ed9 /paludis/paludislike_options_conf.cc
parent537036d40b9142858d2cf863a5d143498e927640 (diff)
downloadpaludis-bb06c0f5ac5e7fe01e5ab0a957bc310179eb5bab.tar.gz
paludis-bb06c0f5ac5e7fe01e5ab0a957bc310179eb5bab.tar.xz
Don't hold versions, keys, choices in a sequence
Diffstat (limited to 'paludis/paludislike_options_conf.cc')
-rw-r--r--paludis/paludislike_options_conf.cc17
1 files changed, 16 insertions, 1 deletions
diff --git a/paludis/paludislike_options_conf.cc b/paludis/paludislike_options_conf.cc
index 2b62a8e77..c493de263 100644
--- a/paludis/paludislike_options_conf.cc
+++ b/paludis/paludislike_options_conf.cc
@@ -204,7 +204,22 @@ PaludisLikeOptionsConf::add_file(const FSPath & f)
tokens.at(0), _imp->params.environment(),
{ updso_allow_wildcards, updso_no_disambiguation, updso_throw_if_set })));
- if (d->all_choice_requirements() && ! d->all_choice_requirements()->empty())
+ if (package_dep_spec_has_properties(*d, make_named_values<PackageDepSpecProperties>(
+ n::has_any_slot_requirement() = indeterminate,
+ n::has_category_name_part() = indeterminate,
+ n::has_choice_requirements() = true,
+ n::has_exact_slot_requirement() = indeterminate,
+ n::has_from_repository() = indeterminate,
+ n::has_in_repository() = indeterminate,
+ n::has_installable_to_path() = indeterminate,
+ n::has_installable_to_repository() = indeterminate,
+ n::has_installed_at_path() = indeterminate,
+ n::has_key_requirements() = indeterminate,
+ n::has_package() = indeterminate,
+ n::has_package_name_part() = indeterminate,
+ n::has_tag() = indeterminate,
+ n::has_version_requirements() = indeterminate
+ )))
{
Log::get_instance()->message("paludislike_options_conf.bad_spec", ll_warning, lc_context)
<< "Dependency specification '" << stringify(*d)