From 0e24207c2e4fedb9c0656ed98bc37cd37df44d91 Mon Sep 17 00:00:00 2001 From: Timo Teräs Date: Mon, 5 Sep 2011 10:51:11 +0300 Subject: solver: report 'complete' solutions with errors Allow to select packages that conflict in case we are looking for errors. This allows 'add --force' to install (on boot) the set of packages with minimum conflicts. --- test/error1.expect | 3 +-- test/error2.expect | 5 +---- test/error3.expect | 3 +-- test/error5.expect | 3 +-- 4 files changed, 4 insertions(+), 10 deletions(-) (limited to 'test') diff --git a/test/error1.expect b/test/error1.expect index d481e43..6f340f1 100644 --- a/test/error1.expect +++ b/test/error1.expect @@ -1,4 +1,3 @@ -3 unsatisfiable dependencies (solution with 3 names) +2 unsatisfiable dependencies (solution with 4 names) world: d>1.5 -b-1: d<2.0 c-1: d>1.0 diff --git a/test/error2.expect b/test/error2.expect index e4e6ffe..5ab9023 100644 --- a/test/error2.expect +++ b/test/error2.expect @@ -1,5 +1,2 @@ -4 unsatisfiable dependencies (solution with 3 names) -world: d<1.5 -a-3: d>1.5 -b-1: d<2.0 +1 unsatisfiable dependencies (solution with 4 names) c-1: d>1.0 diff --git a/test/error3.expect b/test/error3.expect index eefc650..55be962 100644 --- a/test/error3.expect +++ b/test/error3.expect @@ -1,3 +1,2 @@ -1 unsatisfiable dependencies (solution with 3 names) +1 unsatisfiable dependencies (solution with 4 names) world: !b -a-3: b diff --git a/test/error5.expect b/test/error5.expect index e98107c..553ecf3 100644 --- a/test/error5.expect +++ b/test/error5.expect @@ -1,4 +1,3 @@ -3 unsatisfiable dependencies (solution with 3 names) +2 unsatisfiable dependencies (solution with 4 names) a-3: d>1.5 -b-1: d<2.0 c-1: d>1.0 -- cgit v1.2.3-70-g09d2