aboutsummaryrefslogtreecommitdiff
path: root/paludis
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-04-04 09:23:47 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-04-04 09:23:47 +0100
commit83be9aeb5b6ce424eda8f901c3418e0db2cbac95 (patch)
tree426b591aea646580b87995ce26659508eef5dea5 /paludis
parent658a603da143398c3fbf3db3d335ffc92bb7cbb5 (diff)
downloadpaludis-83be9aeb5b6ce424eda8f901c3418e0db2cbac95.tar.gz
paludis-83be9aeb5b6ce424eda8f901c3418e0db2cbac95.tar.xz
Betterer names
Diffstat (limited to 'paludis')
-rw-r--r--paludis/filter.cc4
-rw-r--r--paludis/generator.cc4
-rw-r--r--paludis/match_package.cc2
-rw-r--r--paludis/match_package.se2
-rw-r--r--paludis/resolver/decider.cc4
-rw-r--r--paludis/resolver/get_resolvents_for_helper.cc2
6 files changed, 9 insertions, 9 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())))]);