diff options
author | 2011-06-12 16:53:59 +0100 | |
---|---|---|
committer | 2011-06-12 16:53:59 +0100 | |
commit | defd17a66b3af79ca09d00510c7265993b1728e1 (patch) | |
tree | 44b8f75a11ca5aeaf94247ae9d0b19f43368bc3e /src | |
parent | c675681c1693abf297ba839c40663f02335094a3 (diff) | |
download | paludis-defd17a66b3af79ca09d00510c7265993b1728e1.tar.gz paludis-defd17a66b3af79ca09d00510c7265993b1728e1.tar.xz |
Make resolve --hide affect resolvent selection
Fixes: ticket:1164
Diffstat (limited to 'src')
-rw-r--r-- | src/clients/cave/resolve_common.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/clients/cave/resolve_common.cc b/src/clients/cave/resolve_common.cc index f44858794..63087b146 100644 --- a/src/clients/cave/resolve_common.cc +++ b/src/clients/cave/resolve_common.cc @@ -835,7 +835,13 @@ paludis::cave::resolve_common( get_initial_constraints_for_helper.set_reinstall_scm_days(reinstall_scm_days(resolution_options)); - GetResolventsForHelper get_resolvents_for_helper(env.get()); + RemoveHiddenHelper remove_hidden_helper(env.get()); + for (args::StringSetArg::ConstIterator i(resolution_options.a_hide.begin_args()), + i_end(resolution_options.a_hide.end_args()) ; + i != i_end ; ++i) + remove_hidden_helper.add_hide_spec(parse_spec_with_nice_error(*i, env.get(), { updso_allow_wildcards }, filter::All())); + + GetResolventsForHelper get_resolvents_for_helper(env.get(), std::cref(remove_hidden_helper)); get_resolvents_for_helper.set_target_destination_type(destination_type_from_arg(env.get(), resolution_options.a_make)); if (resolution_options.a_make_dependencies.argument() == "auto") @@ -963,12 +969,6 @@ paludis::cave::resolve_common( i != i_end ; ++i) prefer_or_avoid_helper.add_avoid_name(disambiguate_if_necessary(env.get(), *i)); - RemoveHiddenHelper remove_hidden_helper(env.get()); - for (args::StringSetArg::ConstIterator i(resolution_options.a_hide.begin_args()), - i_end(resolution_options.a_hide.end_args()) ; - i != i_end ; ++i) - remove_hidden_helper.add_hide_spec(parse_spec_with_nice_error(*i, env.get(), { updso_allow_wildcards }, filter::All())); - RemoveIfDependentHelper remove_if_dependent_helper(env.get()); for (args::StringSetArg::ConstIterator i(resolution_options.a_remove_if_dependent.begin_args()), i_end(resolution_options.a_remove_if_dependent.end_args()) ; |