diff options
author | 2011-03-05 17:44:59 +0000 | |
---|---|---|
committer | 2011-03-05 17:44:59 +0000 | |
commit | d973f21c51244c30b682618717d2946aa0025c28 (patch) | |
tree | d3f39e03466bd422d25ea2694c260c434f35a470 | |
parent | 0c1ff159718540f4ffb4d0160daf078d48d478df (diff) | |
download | paludis-d973f21c51244c30b682618717d2946aa0025c28.tar.gz paludis-d973f21c51244c30b682618717d2946aa0025c28.tar.xz |
Fix || ( a ( ) ) logic
-rw-r--r-- | paludis/resolver/any_child_score.se | 2 | ||||
-rw-r--r-- | paludis/resolver/resolver_TEST_any.cc | 1 | ||||
-rw-r--r-- | paludis/resolver/sanitised_dependencies.cc | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/paludis/resolver/any_child_score.se b/paludis/resolver/any_child_score.se index c65d3386c..5de0d692f 100644 --- a/paludis/resolver/any_child_score.se +++ b/paludis/resolver/any_child_score.se @@ -17,6 +17,7 @@ make_enum_AnyChildScore() key acs_already_installed "Already installed" key acs_vacuous_blocker "Blocker that doesn't match any installable packages" key acs_prefer "Explicitly preferred" + key acs_better_than_best "Better than the best option" want_destringify } @@ -31,6 +32,7 @@ make_enum_OperatorScore() key os_less "<, <= etc, or blocker with >, >= etc" key os_equal "=, =* etc" key os_greater_or_none ">, >= etc, or no operator, or blocker with <, <= etc" + key os_better_than_best "Better than the best option" want_destringify } diff --git a/paludis/resolver/resolver_TEST_any.cc b/paludis/resolver/resolver_TEST_any.cc index c08ef49c0..c3829dd65 100644 --- a/paludis/resolver/resolver_TEST_any.cc +++ b/paludis/resolver/resolver_TEST_any.cc @@ -107,7 +107,6 @@ namespace test_cases check_resolved(resolved, n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks() - .change(QualifiedPackageName("test/dep")) .change(QualifiedPackageName("test/target")) .finished()), n::taken_unable_to_make_decisions() = make_shared_copy(DecisionChecks() diff --git a/paludis/resolver/sanitised_dependencies.cc b/paludis/resolver/sanitised_dependencies.cc index a53380161..d4f38eddd 100644 --- a/paludis/resolver/sanitised_dependencies.cc +++ b/paludis/resolver/sanitised_dependencies.cc @@ -280,7 +280,7 @@ namespace g != g_end ; ++g) { /* best possible, to get ( ) right */ - std::pair<AnyChildScore, OperatorScore> worst_score(acs_already_installed, os_greater_or_none); + std::pair<AnyChildScore, OperatorScore> worst_score(acs_better_than_best, os_better_than_best); /* score of a group is the score of the worst child. */ for (std::list<PackageOrBlockDepSpec>::const_iterator h(g->begin()), h_end(g->end()) ; |