aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-10-10 18:34:10 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-10-10 18:34:10 +0100
commit10cd4cfd3c7a61b7bdd04dd23bce0f8fda2ca169 (patch)
tree40ca45c4983fc303b01eacb553a34debae845acc
parent4048bd15f64a6c33b0ee0d7254040ba36fd8c043 (diff)
downloadpaludis-10cd4cfd3c7a61b7bdd04dd23bce0f8fda2ca169.tar.gz
paludis-10cd4cfd3c7a61b7bdd04dd23bce0f8fda2ca169.tar.xz
Less confusicating name
-rw-r--r--paludis/resolver/decider.cc8
-rw-r--r--paludis/resolver/decider.hh2
2 files changed, 5 insertions, 5 deletions
diff --git a/paludis/resolver/decider.cc b/paludis/resolver/decider.cc
index 2873dbf..a7e4cfe 100644
--- a/paludis/resolver/decider.cc
+++ b/paludis/resolver/decider.cc
@@ -588,11 +588,11 @@ Decider::_make_constraints_from_blocker(
break;
case dsar_blocker_manual:
- force_unable = ! _block_dep_spec_already_met(spec, maybe_from_package_id_from_reason(reason), resolution->resolvent());
+ force_unable = ! _block_dep_spec_has_nothing_installed(spec, maybe_from_package_id_from_reason(reason), resolution->resolvent());
break;
case dsar_blocker_upgrade_blocked_before:
- nothing_is_fine_too = ! _block_dep_spec_already_met(spec, maybe_from_package_id_from_reason(reason), resolution->resolvent());
+ nothing_is_fine_too = ! _block_dep_spec_has_nothing_installed(spec, maybe_from_package_id_from_reason(reason), resolution->resolvent());
break;
default:
@@ -1142,7 +1142,7 @@ Decider::_add_dependencies_if_necessary(
/* now we can find out per-resolvent whether we're really already met */
const std::shared_ptr<DependencyReason> reason(std::make_shared<DependencyReason>(
package_id, changed_choices, our_resolution->resolvent(), *s,
- s->spec().if_block() ? _block_dep_spec_already_met(*s->spec().if_block(), package_id, *r) :
+ s->spec().if_block() ? _block_dep_spec_has_nothing_installed(*s->spec().if_block(), package_id, *r) :
_package_dep_spec_already_met(*s->spec().if_package(), package_id)));
const std::shared_ptr<Resolution> dep_resolution(_resolution_for_resolvent(*r, true));
@@ -1949,7 +1949,7 @@ Decider::_package_dep_spec_already_met(const PackageDepSpec & spec, const std::s
}
bool
-Decider::_block_dep_spec_already_met(const BlockDepSpec & spec, const std::shared_ptr<const PackageID> & from_id,
+Decider::_block_dep_spec_has_nothing_installed(const BlockDepSpec & spec, const std::shared_ptr<const PackageID> & from_id,
const Resolvent & resolvent) const
{
Context context("When determining already met for '" + stringify(spec) + "':");
diff --git a/paludis/resolver/decider.hh b/paludis/resolver/decider.hh
index 8657bf5..2216a3b 100644
--- a/paludis/resolver/decider.hh
+++ b/paludis/resolver/decider.hh
@@ -204,7 +204,7 @@ namespace paludis
const PackageDepSpec &,
const std::shared_ptr<const PackageID> &) const PALUDIS_ATTRIBUTE((warn_unused_result));
- bool _block_dep_spec_already_met(
+ bool _block_dep_spec_has_nothing_installed(
const BlockDepSpec &,
const std::shared_ptr<const PackageID> &,
const Resolvent &) const PALUDIS_ATTRIBUTE((warn_unused_result));