corrected output, caused by a bug

diff --git a/testsuite/solver/data.deptestomatic/basic-exercises/exercise-15-test.solution b/testsuite/solver/data.deptestomatic/basic-exercises/exercise-15-test.solution
index c919efb..9731ca3 100644 (file)
--- a/testsuite/solver/data.deptestomatic/basic-exercises/exercise-15-test.solution
+++ b/testsuite/solver/data.deptestomatic/basic-exercises/exercise-15-test.solution
@@ -2,7 +2,7 @@
 >!> 1 problems found:
 >!> Problem:
 >!> Cannot install AA because it is conflicting with A
->!> A conflict over [package] (namedcap) a == 2.0 ([] (nullcap) ) requires the removal of to-be-installed AA-1.0-1[test]
+>!> A conflict over [package] (namedcap) a == 2.0 ([package] (namedcap) a != 1.0) requires the removal of to-be-installed AA-1.0-1[test]
 >!>    Solution:
 >!>       Deleting AA
 >!>       Deleting U___[package]AA-1.0-1.

diff --git a/testsuite/solver/data.deptestomatic/basic-exercises/exercise-6-test.solution b/testsuite/solver/data.deptestomatic/basic-exercises/exercise-6-test.solution
index 72c70ee..2c5941c 100644 (file)
--- a/testsuite/solver/data.deptestomatic/basic-exercises/exercise-6-test.solution
+++ b/testsuite/solver/data.deptestomatic/basic-exercises/exercise-6-test.solution
@@ -2,7 +2,7 @@
 >!> 1 problems found:
 >!> Problem:
 >!> Cannot install AA because it is conflicting with A
->!> A conflict over [package] (namedcap) a == 2.3 ([] (nullcap) ) requires the removal of to-be-installed AA-1.0-1[test]
+>!> A conflict over [package] (namedcap) a == 2.3 ([package] (namedcap) a != 2.0) requires the removal of to-be-installed AA-1.0-1[test]
 >!>    Solution:
 >!>       Deleting AA
 >!>       Deleting U___[package]AA-1.0-1.

diff --git a/testsuite/solver/data.deptestomatic/basic-exercises/exercise-9-test.solution b/testsuite/solver/data.deptestomatic/basic-exercises/exercise-9-test.solution
index 4a6eb8f..8d49854 100644 (file)
--- a/testsuite/solver/data.deptestomatic/basic-exercises/exercise-9-test.solution
+++ b/testsuite/solver/data.deptestomatic/basic-exercises/exercise-9-test.solution
@@ -2,7 +2,7 @@
 >!> 1 problems found:
 >!> Problem:
 >!> Cannot install AA because it is conflicting with A
->!> A conflict over [package] (namedcap) a == 1.1 ([] (nullcap) ) requires the removal of to-be-installed AA-1.0-1[test]
+>!> A conflict over [package] (namedcap) a == 1.1 ([package] (namedcap) a != 1.0) requires the removal of to-be-installed AA-1.0-1[test]
 >!>    Solution:
 >!>       Deleting AA
 >!>       Deleting U___[package]AA-1.0-1.

diff --git a/testsuite/solver/data.deptestomatic/solution-tests/conflict-test.solution b/testsuite/solver/data.deptestomatic/solution-tests/conflict-test.solution
index 6cb1574..47b4bac 100644 (file)
--- a/testsuite/solver/data.deptestomatic/solution-tests/conflict-test.solution
+++ b/testsuite/solver/data.deptestomatic/solution-tests/conflict-test.solution
@@ -3,7 +3,7 @@
 >!> 1 problems found:
 >!> Problem:
 >!> Cannot install B because it is conflicting with A
->!> A conflict over [package] (namedcap) B == 1.0-1 ([] (nullcap) ) requires the removal of to-be-installed B-1.0-1[test]
+>!> A conflict over [package] (namedcap) B == 1.0-1 ([package] (namedcap) B) requires the removal of to-be-installed B-1.0-1[test]
 >!>    Solution:
 >!>       Deleting B
 >!>       Deleting U___[package]B-1.0-1.

diff --git a/testsuite/solver/data.deptestomatic/solution-tests/conflict2-test.solution b/testsuite/solver/data.deptestomatic/solution-tests/conflict2-test.solution
index 1301720..47c2a8c 100644 (file)
--- a/testsuite/solver/data.deptestomatic/solution-tests/conflict2-test.solution
+++ b/testsuite/solver/data.deptestomatic/solution-tests/conflict2-test.solution
@@ -2,7 +2,7 @@
 >!> 1 problems found:
 >!> Problem:
 >!> Cannot install B because it is conflicting with A
->!> A conflict over [package] (namedcap) B == 1.0-1 ([] (nullcap) ) requires the removal of to-be-installed B-1.0-1[test]
+>!> A conflict over [package] (namedcap) B == 1.0-1 ([package] (namedcap) B) requires the removal of to-be-installed B-1.0-1[test]
 >!>    Solution:
 >!>       Deleting B
 >!>       Deleting U___[package]B-1.0-1.

diff --git a/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-01-test.solution b/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-01-test.solution
index 673dccf..98f339e 100644 (file)
--- a/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-01-test.solution
+++ b/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-01-test.solution
@@ -2,7 +2,7 @@
 >!> 1 problems found:
 >!> Problem:
 >!> Cannot install p2 because it is conflicting with p1
->!> A conflict over [package] (namedcap) p2 == 1.0-1 ([] (nullcap) ) requires the removal of to-be-installed p2-1.0-1[test]
+>!> A conflict over [package] (namedcap) p2 == 1.0-1 ([package] (namedcap) p2) requires the removal of to-be-installed p2-1.0-1[test]
 >!>    Solution:
 >!>       Deleting p2
 >!>       Deleting U___[package]p2-1.0-1.

diff --git a/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-02-test.solution b/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-02-test.solution
index c94b0b6..ecacb08 100644 (file)
--- a/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-02-test.solution
+++ b/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-02-test.solution
@@ -2,7 +2,7 @@
 >!> 1 problems found:
 >!> Problem:
 >!> Cannot install sendmail because it is conflicting with smail
->!> A conflict over [package] (namedcap) MTA ([] (nullcap) ) requires the removal of to-be-installed sendmail-2.0-1[test]
+>!> A conflict over [package] (namedcap) MTA ([package] (namedcap) MTA) requires the removal of to-be-installed sendmail-2.0-1[test]
 >!>    Solution:
 >!>       Deleting sendmail
 >!>       Deleting U___[package]sendmail-2.0-1.

diff --git a/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-04-test.solution b/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-04-test.solution
index a958cc1..f261cc5 100644 (file)
--- a/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-04-test.solution
+++ b/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-04-test.solution
@@ -2,7 +2,7 @@
 >!> 1 problems found:
 >!> Problem:
 >!> Cannot install libident because it is conflicting with smail
->!> A conflict over [package] (namedcap) libident == 2.0-1 ([] (nullcap) ) requires the removal of to-be-installed libident-2.0-1[test]
+>!> A conflict over [package] (namedcap) libident == 2.0-1 ([package] (namedcap) libident >= 2.0) requires the removal of to-be-installed libident-2.0-1[test]
 >!>    Solution:
 >!>       Deleting libident
 >!>       Deleting U___[package]libident-2.0-1.

diff --git a/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-10-test.solution b/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-10-test.solution
index 79973c1..1c38447 100644 (file)
--- a/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-10-test.solution
+++ b/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-10-test.solution
@@ -2,7 +2,7 @@
 >!> 1 problems found:
 >!> Problem:
 >!> Cannot install baz3 because it is conflicting with foo3
->!> A conflict over [package] (namedcap) baz31 ([] (nullcap) ) requires the removal of to-be-installed baz3-1.0-1[test]
+>!> A conflict over [package] (namedcap) baz31 ([package] (namedcap) baz31) requires the removal of to-be-installed baz3-1.0-1[test]
 >!>    Solution:
 >!>       Deleting baz3
 >!>       Deleting U___[package]baz3-1.0-1.