bugfix in ignoring cap

diff --git a/testsuite/solver/data.deptestomatic/solution-tests/conflict3-test.solution b/testsuite/solver/data.deptestomatic/solution-tests/conflict3-test.solution
index 5f98996..6bef1e9 100644 (file)
--- a/testsuite/solver/data.deptestomatic/solution-tests/conflict3-test.solution
+++ b/testsuite/solver/data.deptestomatic/solution-tests/conflict3-test.solution
@@ -6,10 +6,10 @@
 >!> 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.
+>!>       Deleting U_Tl_[package]B-1.0-1.
 >!>    Solution:
 >!>       Deleting A
->!>       Deleting U___[package]A-1.0-1.
+>!>       Deleting U_Tl_[package]A-1.0-1.
 >!>    Solution:
 >!>       Ignoring conflict of B
 >!>       

diff --git a/testsuite/solver/data.deptestomatic/solution-tests/ignore b/testsuite/solver/data.deptestomatic/solution-tests/ignore
index b70be74..7b7d470 100644 (file)
--- a/testsuite/solver/data.deptestomatic/solution-tests/ignore
+++ b/testsuite/solver/data.deptestomatic/solution-tests/ignore
@@ -4,4 +4,3 @@ other-architect-test.xml
 parallel-test.xml
 unfulfilled-3-test.xml
 uninstall-test.xml
-conflict3-test.xml

diff --git a/testsuite/solver/data.deptestomatic/solution-tests/require-test.solution b/testsuite/solver/data.deptestomatic/solution-tests/require-test.solution
index dc1c73d..f1469bf 100644 (file)
--- a/testsuite/solver/data.deptestomatic/solution-tests/require-test.solution
+++ b/testsuite/solver/data.deptestomatic/solution-tests/require-test.solution
@@ -5,7 +5,7 @@
 >!> There are no installable providers of [package] (namedcap) foo for foonew-2.0-1[test]
 >!>    Solution:
 >!>       Deleting foonew
->!>       Deleting U___[package]foonew-2.0-1.
+>!>       Deleting U_Tl_[package]foonew-2.0-1.
 >!>    Solution:
 >!>       Ignoring this requirement
 >!>