From afd854a3e2cf20b3f35c5503c9df9589f482dc74 Mon Sep 17 00:00:00 2001 From: Timo Teräs Date: Fri, 14 Oct 2011 20:48:20 +0300 Subject: solver: preference scoring Should now choose packages better if the best available version is uninstallable for some reason. --- test/error1.expect | 5 ++--- test/error2.expect | 2 +- test/error3.expect | 4 ++-- test/error5.expect | 5 ++--- 4 files changed, 7 insertions(+), 9 deletions(-) (limited to 'test') diff --git a/test/error1.expect b/test/error1.expect index 6f340f1..ddd4f4f 100644 --- a/test/error1.expect +++ b/test/error1.expect @@ -1,3 +1,2 @@ -2 unsatisfiable dependencies (solution with 4 names) -world: d>1.5 -c-1: d>1.0 +1 unsatisfiable dependencies (solution with 4 names) +b-1: d<2.0 diff --git a/test/error2.expect b/test/error2.expect index 5ab9023..7faac5e 100644 --- a/test/error2.expect +++ b/test/error2.expect @@ -1,2 +1,2 @@ 1 unsatisfiable dependencies (solution with 4 names) -c-1: d>1.0 +world: d<1.5 diff --git a/test/error3.expect b/test/error3.expect index 55be962..d04f76e 100644 --- a/test/error3.expect +++ b/test/error3.expect @@ -1,2 +1,2 @@ -1 unsatisfiable dependencies (solution with 4 names) -world: !b +1 unsatisfiable dependencies (solution with 3 names) +a-3: b diff --git a/test/error5.expect b/test/error5.expect index 553ecf3..ddd4f4f 100644 --- a/test/error5.expect +++ b/test/error5.expect @@ -1,3 +1,2 @@ -2 unsatisfiable dependencies (solution with 4 names) -a-3: d>1.5 -c-1: d>1.0 +1 unsatisfiable dependencies (solution with 4 names) +b-1: d<2.0 -- cgit v1.2.3-70-g09d2