From b00bd24f7323151ece932b902ec48b867aaaa16b Mon Sep 17 00:00:00 2001 From: Ciaran McCreesh Date: Tue, 7 Aug 2012 12:14:19 +0100 Subject: Make presumed logic work --- paludis/repositories/e/dep_parser.cc | 5 +++-- paludis/repositories/e/e_choices_key.cc | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'paludis/repositories/e') diff --git a/paludis/repositories/e/dep_parser.cc b/paludis/repositories/e/dep_parser.cc index d423c9a7f..0d1728abe 100644 --- a/paludis/repositories/e/dep_parser.cc +++ b/paludis/repositories/e/dep_parser.cc @@ -111,10 +111,11 @@ namespace const EAPI & eapi, bool add_explicit_choices_requirement) { + auto mentioned(std::make_shared >()); auto data(partial_parse_elike_package_dep_spec(s, eapi.supported()->package_dep_spec_parse_options(), - eapi.supported()->version_spec_options())); + eapi.supported()->version_spec_options(), mentioned)); if (add_explicit_choices_requirement) - data.additional_requirement(make_elike_presumed_choices_requirement()); + data.additional_requirement(make_elike_presumed_choices_requirement(mentioned)); std::shared_ptr spec(std::make_shared(data)); h.begin()->item()->append(spec); h.begin()->children().push_back(spec); diff --git a/paludis/repositories/e/e_choices_key.cc b/paludis/repositories/e/e_choices_key.cc index 62ec64948..e250f11c1 100644 --- a/paludis/repositories/e/e_choices_key.cc +++ b/paludis/repositories/e/e_choices_key.cc @@ -163,7 +163,7 @@ namespace if (m_role != node.spec()->maybe_annotations()->end()) p->second.insert(std::make_pair(n, MyOptionsInfo{ m_role->value(), false })).first->second.description = m_role->value(); else - p->second.insert(std::make_pair(n, MyOptionsInfo{ m_role->value(), false })); + p->second.insert(std::make_pair(n, MyOptionsInfo{ "", false })); auto n_role(node.spec()->maybe_annotations()->find(dsar_myoptions_presumed)); if (n_role != node.spec()->maybe_annotations()->end()) -- cgit v1.2.3