From 0f895650996a2565c0dc59d3c94f861145b42c05 Mon Sep 17 00:00:00 2001 From: Timo Teräs Date: Fri, 20 Jan 2012 10:39:00 +0200 Subject: solver: fix regression from "calculate branch minimum penalty early" Forgot to reset per-name penalty when it got locked by apply_decision. This also fine tunes compare_package_preference() to always prefer packages specified on command line speeding up calculation certain complicated solutions. --- test/error2.expect | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'test/error2.expect') diff --git a/test/error2.expect b/test/error2.expect index 65d0093..7faac5e 100644 --- a/test/error2.expect +++ b/test/error2.expect @@ -1,3 +1,2 @@ -2 unsatisfiable dependencies (solution with 4 names) +1 unsatisfiable dependencies (solution with 4 names) world: d<1.5 -b-1: d<2.0 -- cgit v1.2.3-70-g09d2