Fix || ( a ( ) ) logic

3 files changed, 3 insertions, 2 deletions

diff --git a/paludis/resolver/any_child_score.se b/paludis/resolver/any_child_score.se
index c65d338..5de0d69 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 c08ef49..c3829dd 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 a533801..d4f38ed 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()) ;