diff options
author | 2011-04-04 09:23:47 +0100 | |
---|---|---|
committer | 2011-04-04 09:23:47 +0100 | |
commit | 83be9aeb5b6ce424eda8f901c3418e0db2cbac95 (patch) | |
tree | 426b591aea646580b87995ce26659508eef5dea5 | |
parent | 658a603da143398c3fbf3db3d335ffc92bb7cbb5 (diff) | |
download | paludis-83be9aeb5b6ce424eda8f901c3418e0db2cbac95.tar.gz paludis-83be9aeb5b6ce424eda8f901c3418e0db2cbac95.tar.xz |
Betterer names
-rw-r--r-- | paludis/filter.cc | 4 | ||||
-rw-r--r-- | paludis/generator.cc | 4 | ||||
-rw-r--r-- | paludis/match_package.cc | 2 | ||||
-rw-r--r-- | paludis/match_package.se | 2 | ||||
-rw-r--r-- | paludis/resolver/decider.cc | 4 | ||||
-rw-r--r-- | paludis/resolver/get_resolvents_for_helper.cc | 2 | ||||
-rw-r--r-- | python/generator_TEST.py | 6 | ||||
-rw-r--r-- | ruby/generator_TEST.rb | 4 | ||||
-rw-r--r-- | ruby/paludis_ruby.cc | 8 | ||||
-rwxr-xr-x | src/clients/cave/cmd_display_resolution.cc | 2 |
10 files changed, 19 insertions, 19 deletions
diff --git a/paludis/filter.cc b/paludis/filter.cc index f6faff11d..787dd9e10 100644 --- a/paludis/filter.cc +++ b/paludis/filter.cc @@ -467,8 +467,8 @@ namespace virtual std::string as_string() const { std::string suffix; - if (options[mpo_ignore_additional_requirements]) - suffix = " (ignoring additional requirements)"; + if (options[mpo_ignore_choice_constraints]) + suffix = " (ignoring choice constraints)"; return "packages matching " + stringify(spec) + suffix; } }; diff --git a/paludis/generator.cc b/paludis/generator.cc index b6fe5e44f..b1e88176f 100644 --- a/paludis/generator.cc +++ b/paludis/generator.cc @@ -475,8 +475,8 @@ namespace virtual std::string as_string() const { std::string suffix; - if (options[mpo_ignore_additional_requirements]) - suffix = " (ignoring additional requirements)"; + if (options[mpo_ignore_choice_constraints]) + suffix = " (ignoring choice constraints)"; return "packages matching " + stringify(spec) + suffix; } }; diff --git a/paludis/match_package.cc b/paludis/match_package.cc index 2001ec483..8e92d7ca0 100644 --- a/paludis/match_package.cc +++ b/paludis/match_package.cc @@ -168,7 +168,7 @@ paludis::match_package_with_maybe_changes( /* don't care */ } - if (! options[mpo_ignore_additional_requirements]) + if (! options[mpo_ignore_choice_constraints]) { if (spec.all_choice_constraints()) { diff --git a/paludis/match_package.se b/paludis/match_package.se index bd6b7e58e..a98ca1d07 100644 --- a/paludis/match_package.se +++ b/paludis/match_package.se @@ -6,7 +6,7 @@ make_enum_MatchPackageOption() prefix mpo want_destringify - key mpo_ignore_additional_requirements "Ignore additional requirements" + key mpo_ignore_choice_constraints "Ignore choice constraints" doxygen_comment << "END" /** diff --git a/paludis/resolver/decider.cc b/paludis/resolver/decider.cc index 69c3f5918..a89d31333 100644 --- a/paludis/resolver/decider.cc +++ b/paludis/resolver/decider.cc @@ -1345,7 +1345,7 @@ Decider::find_any_score( Context sub_context("When working out whether it's acs_vacuous_blocker:"); const std::shared_ptr<const PackageIDSequence> ids((*_imp->env)[selection::BestVersionOnly( - generator::Matches(spec, our_id, { mpo_ignore_additional_requirements }) + generator::Matches(spec, our_id, { mpo_ignore_choice_constraints }) | filter::SupportsAction<InstallAction>() | filter::NotMasked() )]); if (ids->empty()) @@ -1845,7 +1845,7 @@ Decider::_find_id_for_from( { MatchPackageOptions opts; if (trying_changing_choices) - opts += mpo_ignore_additional_requirements; + opts += mpo_ignore_choice_constraints; std::shared_ptr<const PackageID> best_version; for (PackageIDSequence::ReverseConstIterator i(ids->rbegin()), i_end(ids->rend()) ; diff --git a/paludis/resolver/get_resolvents_for_helper.cc b/paludis/resolver/get_resolvents_for_helper.cc index f3b97e2c7..64026ddc4 100644 --- a/paludis/resolver/get_resolvents_for_helper.cc +++ b/paludis/resolver/get_resolvents_for_helper.cc @@ -274,7 +274,7 @@ GetResolventsForHelper::operator() ( std::shared_ptr<const PackageID> best; auto ids((*_imp->env)[selection::BestVersionOnly( - generator::Matches(spec, from_id, { mpo_ignore_additional_requirements }) | + generator::Matches(spec, from_id, { mpo_ignore_choice_constraints }) | filter::SupportsAction<InstallAction>() | filter::NotMasked() | (maybe_slot ? Filter(filter::Slot(*maybe_slot)) : Filter(filter::All())))]); diff --git a/python/generator_TEST.py b/python/generator_TEST.py index 4d8b0deed..c1b690c5a 100644 --- a/python/generator_TEST.py +++ b/python/generator_TEST.py @@ -2,7 +2,7 @@ # vim: set fileencoding=utf-8 sw=4 sts=4 et : # -# Copyright (c) 2008 Ciaran McCreesh +# Copyright (c) 2008, 2011 Ciaran McCreesh # # This file is part of the Paludis package manager. Paludis is free software; # you can redistribute it and/or modify it under the terms of the GNU General @@ -35,8 +35,8 @@ class TestCase_01_Generator(unittest.TestCase): self.assertEquals(str(Generator.Matches(parse_user_package_dep_spec("foo/bar", env, []), MatchPackageOptions())), "packages matching foo/bar") self.assertEquals(str(Generator.Matches(parse_user_package_dep_spec("foo/bar", - env, []), [MatchPackageOption.IGNORE_ADDITIONAL_REQUIREMENTS])), - "packages matching foo/bar (ignoring additional requirements)") + env, []), [MatchPackageOption.IGNORE_CHOICE_CONSTRAINTS])), + "packages matching foo/bar (ignoring choice constraints)") if __name__ == "__main__": diff --git a/ruby/generator_TEST.rb b/ruby/generator_TEST.rb index 7b91c0820..ffef5d0c3 100644 --- a/ruby/generator_TEST.rb +++ b/ruby/generator_TEST.rb @@ -59,8 +59,8 @@ module Paludis assert_equal Generator::Matches.new(Paludis::parse_user_package_dep_spec("a/b", env, []), nil, []).to_s, "packages matching a/b" assert_equal Generator::Matches.new(Paludis::parse_user_package_dep_spec("a/b", env, []), - nil, [:ignore_additional_requirements]).to_s, - "packages matching a/b (ignoring additional requirements)" + nil, [:ignore_choice_constraints]).to_s, + "packages matching a/b (ignoring choice constraints)" end end diff --git a/ruby/paludis_ruby.cc b/ruby/paludis_ruby.cc index cf749d216..7ce44f23b 100644 --- a/ruby/paludis_ruby.cc +++ b/ruby/paludis_ruby.cc @@ -384,8 +384,8 @@ paludis::ruby::value_to_match_package_options(VALUE v) { VALUE entry(rb_ary_entry(v, i)); Check_Type(entry, T_SYMBOL); - if (SYM2ID(entry) == rb_intern("ignore_additional_requirements")) - o += mpo_ignore_additional_requirements; + if (SYM2ID(entry) == rb_intern("ignore_choice_constraints")) + o += mpo_ignore_choice_constraints; else rb_raise(rb_eArgError, "Unknown MatchPackageOptions option '%s'", rb_obj_as_string(entry)); } @@ -396,8 +396,8 @@ VALUE paludis::ruby::match_package_options_to_value(const MatchPackageOptions & o) { VALUE a(rb_ary_new()); - if (o[mpo_ignore_additional_requirements]) - rb_ary_push(a, ID2SYM(rb_intern("ignore_additional_requirements"))); + if (o[mpo_ignore_choice_constraints]) + rb_ary_push(a, ID2SYM(rb_intern("ignore_choice_constraints"))); return a; } diff --git a/src/clients/cave/cmd_display_resolution.cc b/src/clients/cave/cmd_display_resolution.cc index 20c137ded..6f1ba4d9a 100755 --- a/src/clients/cave/cmd_display_resolution.cc +++ b/src/clients/cave/cmd_display_resolution.cc @@ -1423,7 +1423,7 @@ namespace if ((*c)->spec().if_package() && (*c)->spec().if_package()->all_choice_constraints() && (! match_package(*env, *(*c)->spec().if_package(), u->package_id(), (*c)->from_id(), { })) && - match_package(*env, *(*c)->spec().if_package(), u->package_id(), (*c)->from_id(), { mpo_ignore_additional_requirements })) + match_package(*env, *(*c)->spec().if_package(), u->package_id(), (*c)->from_id(), { mpo_ignore_choice_constraints })) { for (auto a((*c)->spec().if_package()->all_choice_constraints()->begin()), a_end((*c)->spec().if_package()->all_choice_constraints()->end()) ; |