renamed resovlable to resItem

diff --git a/zypp/solver/testsuite/deptestomatic/exercise-02conflict-07-test.out b/zypp/solver/testsuite/deptestomatic/exercise-02conflict-07-test.out
index 061a784..efa8575 100644 (file)
--- a/zypp/solver/testsuite/deptestomatic/exercise-02conflict-07-test.out
+++ b/zypp/solver/testsuite/deptestomatic/exercise-02conflict-07-test.out
@@ -24,6 +24,6 @@ total priority=0, min priority=800, max priority=800
 other penalties=0
 - - - - - - - - - -
 Installing test4-1.0-1[test]
-Marking resolvable test3-1.0-1 as uninstallable
+Marking resItem test3-1.0-1 as uninstallable
 test2-1.0-1: conflicts with  [test4-1.0-1]
 

diff --git a/zypp/solver/testsuite/deptestomatic/exercise-02conflict-10-test.out b/zypp/solver/testsuite/deptestomatic/exercise-02conflict-10-test.out
index 3f6140c..0d9d6bd 100644 (file)
--- a/zypp/solver/testsuite/deptestomatic/exercise-02conflict-10-test.out
+++ b/zypp/solver/testsuite/deptestomatic/exercise-02conflict-10-test.out
@@ -25,5 +25,5 @@ other penalties=0
 - - - - - - - - - -
 Installing baz3-1.0-1[test]
 foo3-1.0-1: conflicts with  [baz3-1.0-1]
-Marking resolvable foo3-2.0-1 as uninstallable
+Marking resItem foo3-2.0-1 as uninstallable
 

diff --git a/zypp/solver/testsuite/deptestomatic/exercise-04obsoletes-02-test.out b/zypp/solver/testsuite/deptestomatic/exercise-04obsoletes-02-test.out
index b13f2d2..ed76620 100644 (file)
--- a/zypp/solver/testsuite/deptestomatic/exercise-04obsoletes-02-test.out
+++ b/zypp/solver/testsuite/deptestomatic/exercise-04obsoletes-02-test.out
@@ -15,5 +15,5 @@ Download Size: 246, Install Size: 912, Total Priority: 0, Min Priority: 800, Max
 - - - - - - - - - -
 Installing barnew-2.0-1[test]
 Installing barc-1.0-1[test]
-[ERROR] A conflict over  bar (bar) requires the removal of the to-be-installed resolvable barnew-2.0-1[test] [barc-1.0-1]
+[ERROR] A conflict over  bar (bar) requires the removal of the to-be-installed resItem barnew-2.0-1[test] [barc-1.0-1]
 [ERROR] Marking this resolution attempt as invalid.

diff --git a/zypp/solver/testsuite/deptestomatic/exercise-04obsoletes-03-test.out b/zypp/solver/testsuite/deptestomatic/exercise-04obsoletes-03-test.out
index 9e420d4..f6d7737 100644 (file)
--- a/zypp/solver/testsuite/deptestomatic/exercise-04obsoletes-03-test.out
+++ b/zypp/solver/testsuite/deptestomatic/exercise-04obsoletes-03-test.out
@@ -15,5 +15,5 @@ Download Size: 246, Install Size: 912, Total Priority: 0, Min Priority: 800, Max
 - - - - - - - - - -
 Installing baznew-2.0-1[test]
 Installing bazc-1.0-1[test]
-[ERROR] A conflict over <= baz-1.2 (baz) requires the removal of the to-be-installed resolvable baznew-2.0-1[test] [bazc-1.0-1]
+[ERROR] A conflict over <= baz-1.2 (baz) requires the removal of the to-be-installed resItem baznew-2.0-1[test] [bazc-1.0-1]
 [ERROR] Marking this resolution attempt as invalid.

diff --git a/zypp/solver/testsuite/deptestomatic/exercise-04obsoletes-07-test.out b/zypp/solver/testsuite/deptestomatic/exercise-04obsoletes-07-test.out
index 2d7db5e..834f8a9 100644 (file)
--- a/zypp/solver/testsuite/deptestomatic/exercise-04obsoletes-07-test.out
+++ b/zypp/solver/testsuite/deptestomatic/exercise-04obsoletes-07-test.out
@@ -16,5 +16,5 @@ Download Size: 246, Install Size: 912, Total Priority: 0, Min Priority: 800, Max
 Installing A-1.0-1[test]
 Installing B-1.0-1[test]
 Marking C-1.0-1[test] as uninstallable due to conflicts over  C (C-1.0-1) from B-1.0-1[test] [B-1.0-1, C-1.0-1]
-[ERROR] A conflict over  A (A-1.0-1) requires the removal of the to-be-installed resolvable A-1.0-1[test] [B-1.0-1]
+[ERROR] A conflict over  A (A-1.0-1) requires the removal of the to-be-installed resItem A-1.0-1[test] [B-1.0-1]
 [ERROR] Marking this resolution attempt as invalid.

diff --git a/zypp/solver/testsuite/deptestomatic/exercise-04obsoletes-08-test.out b/zypp/solver/testsuite/deptestomatic/exercise-04obsoletes-08-test.out
index 29ce8db..583faac 100644 (file)
--- a/zypp/solver/testsuite/deptestomatic/exercise-04obsoletes-08-test.out
+++ b/zypp/solver/testsuite/deptestomatic/exercise-04obsoletes-08-test.out
@@ -15,5 +15,5 @@ Download Size: 246, Install Size: 912, Total Priority: 0, Min Priority: 800, Max
 - - - - - - - - - -
 Installing B-1.0-1[test]
 Installing C-1.0-1[test]
-[ERROR] A conflict over  C (C-1.0-1) requires the removal of the to-be-installed resolvable C-1.0-1[test] [B-1.0-1]
+[ERROR] A conflict over  C (C-1.0-1) requires the removal of the to-be-installed resItem C-1.0-1[test] [B-1.0-1]
 [ERROR] Marking this resolution attempt as invalid.

diff --git a/zypp/solver/testsuite/deptestomatic/exercise-06upgrade-test.out b/zypp/solver/testsuite/deptestomatic/exercise-06upgrade-test.out
index d4d7d9a..1eb0087 100644 (file)
--- a/zypp/solver/testsuite/deptestomatic/exercise-06upgrade-test.out
+++ b/zypp/solver/testsuite/deptestomatic/exercise-06upgrade-test.out
@@ -33,7 +33,7 @@ Upgrading p6-1.0-1 => p6-2.0-1[test]
 Upgrading p8-1.0-1 => p8-2.0-1[test]
 Upgrading p8a-1.0-1 => p8a-2.0-1[test]
 Upgrading p9-1.0-1 => p9-2.0-1[test]
-Marking resolvable p6b-2.0-1 as uninstallable
+Marking resItem p6b-2.0-1 as uninstallable
 p3a-2.0-1[test]:  needed by  [p3-2.0-1]
 Installing p3a-2.0-1[test]
 p9a-2.0-1[test]:  needed by  [p9-2.0-1]

diff --git a/zypp/solver/testsuite/deptestomatic/exercise-bug21829-2-test.out b/zypp/solver/testsuite/deptestomatic/exercise-bug21829-2-test.out
index 60e7231..276cdc7 100644 (file)
--- a/zypp/solver/testsuite/deptestomatic/exercise-bug21829-2-test.out
+++ b/zypp/solver/testsuite/deptestomatic/exercise-bug21829-2-test.out
@@ -26,5 +26,5 @@ other penalties=0
 - - - - - - - - - -
 Installing lsb-1.0-1[test]
 Installing cups-client-1.0-1[test]
-Marking resolvable lprng-1.0-1 as uninstallable
+Marking resItem lprng-1.0-1 as uninstallable
 

diff --git a/zypp/solver/testsuite/deptestomatic/exercise-bug21829-3-test.out b/zypp/solver/testsuite/deptestomatic/exercise-bug21829-3-test.out
index 8d8182d..555fe8a 100644 (file)
--- a/zypp/solver/testsuite/deptestomatic/exercise-bug21829-3-test.out
+++ b/zypp/solver/testsuite/deptestomatic/exercise-bug21829-3-test.out
@@ -26,5 +26,5 @@ other penalties=0
 - - - - - - - - - -
 Installing lsb-1.0-1[test]
 Installing lprng-1.0-1[test]
-Marking resolvable cups-client-1.0-1 as uninstallable
+Marking resItem cups-client-1.0-1 as uninstallable
 

diff --git a/zypp/solver/testsuite/deptestomatic/exercise-bug21829-4-test.out b/zypp/solver/testsuite/deptestomatic/exercise-bug21829-4-test.out
index 36dab56..f528df0 100644 (file)
--- a/zypp/solver/testsuite/deptestomatic/exercise-bug21829-4-test.out
+++ b/zypp/solver/testsuite/deptestomatic/exercise-bug21829-4-test.out
@@ -29,5 +29,5 @@ Installing lsb-1.0-1[test]
 Installing cups-1.0-1[test]
 cups-client-1.0-1[test]:  needed by  [cups-1.0-1]
 Installing cups-client-1.0-1[test]
-Marking resolvable lprng-1.0-1 as uninstallable
+Marking resItem lprng-1.0-1 as uninstallable
 

diff --git a/zypp/solver/testsuite/deptestomatic/exercise-bug21829-5-test.out b/zypp/solver/testsuite/deptestomatic/exercise-bug21829-5-test.out
index 433797b..1a9a709 100644 (file)
--- a/zypp/solver/testsuite/deptestomatic/exercise-bug21829-5-test.out
+++ b/zypp/solver/testsuite/deptestomatic/exercise-bug21829-5-test.out
@@ -25,7 +25,7 @@ other penalties=-800
 - - - - - - - - - -
 lprng-1.0-1[test]:  needed by  [lsb-1.0-1]
 Installing lprng-1.0-1[test]
-Marking resolvable cups-client-1.0-1 as uninstallable
+Marking resItem cups-client-1.0-1 as uninstallable
 Installing lsb-1.0-1[test]
 
 Other Valid Solutions:
@@ -42,6 +42,6 @@ other penalties=-800
 - - - - - - - - - -
 cups-client-1.0-1[test]:  needed by  [lsb-1.0-1]
 Installing cups-client-1.0-1[test]
-Marking resolvable lprng-1.0-1 as uninstallable
+Marking resItem lprng-1.0-1 as uninstallable
 Installing lsb-1.0-1[test]
 

diff --git a/zypp/solver/testsuite/deptestomatic/exercise-obscureobsoletes-07-test.out b/zypp/solver/testsuite/deptestomatic/exercise-obscureobsoletes-07-test.out
index 56c9629..b138198 100644 (file)
--- a/zypp/solver/testsuite/deptestomatic/exercise-obscureobsoletes-07-test.out
+++ b/zypp/solver/testsuite/deptestomatic/exercise-obscureobsoletes-07-test.out
@@ -15,5 +15,5 @@ Download Size: 246, Install Size: 912, Total Priority: 0, Min Priority: 800, Max
 - - - - - - - - - -
 Installing aaa-1.0-1[test]
 Installing bbb-2.0-1[test]
-[ERROR] A conflict over  bbb (bbb-2.0-1) requires the removal of the to-be-installed resolvable bbb-2.0-1[test] [aaa-1.0-1]
+[ERROR] A conflict over  bbb (bbb-2.0-1) requires the removal of the to-be-installed resItem bbb-2.0-1[test] [aaa-1.0-1]
 [ERROR] Marking this resolution attempt as invalid.

diff --git a/zypp/solver/testsuite/deptestomatic/exercise-obscureobsoletes-09-test.out b/zypp/solver/testsuite/deptestomatic/exercise-obscureobsoletes-09-test.out
index fb56527..a0bc51a 100644 (file)
--- a/zypp/solver/testsuite/deptestomatic/exercise-obscureobsoletes-09-test.out
+++ b/zypp/solver/testsuite/deptestomatic/exercise-obscureobsoletes-09-test.out
@@ -19,5 +19,5 @@ aaa-1.0-1[test]:  needed by  [ddd-1.0-1]
 Installing aaa-1.0-1[test]
 bbb-2.0-1[test]:  needed by  [ccc-1.0-1]
 Installing bbb-2.0-1[test]
-[ERROR] A conflict over  bbb (bbb-2.0-1) requires the removal of the to-be-installed resolvable bbb-2.0-1[test] [aaa-1.0-1]
+[ERROR] A conflict over  bbb (bbb-2.0-1) requires the removal of the to-be-installed resItem bbb-2.0-1[test] [aaa-1.0-1]
 [ERROR] Marking this resolution attempt as invalid.

diff --git a/zypp/solver/testsuite/deptestomatic/exercise-obscureobsoletes-10-test.out b/zypp/solver/testsuite/deptestomatic/exercise-obscureobsoletes-10-test.out
index e3fb67f..45df030 100644 (file)
--- a/zypp/solver/testsuite/deptestomatic/exercise-obscureobsoletes-10-test.out
+++ b/zypp/solver/testsuite/deptestomatic/exercise-obscureobsoletes-10-test.out
@@ -15,5 +15,5 @@ Download Size: 246, Install Size: 912, Total Priority: 0, Min Priority: 800, Max
 - - - - - - - - - -
 Installing eee-1.0-1[test]
 Installing fff-1.0-1[test]
-[ERROR] A conflict over  eee (eee-1.0-1) requires the removal of the to-be-installed resolvable eee-1.0-1[test] [fff-1.0-1]
+[ERROR] A conflict over  eee (eee-1.0-1) requires the removal of the to-be-installed resItem eee-1.0-1[test] [fff-1.0-1]
 [ERROR] Marking this resolution attempt as invalid.

diff --git a/zypp/solver/testsuite/deptestomatic/exercise-obscureobsoletes-11-test.out b/zypp/solver/testsuite/deptestomatic/exercise-obscureobsoletes-11-test.out
index dc404ef..07bffb1 100644 (file)
--- a/zypp/solver/testsuite/deptestomatic/exercise-obscureobsoletes-11-test.out
+++ b/zypp/solver/testsuite/deptestomatic/exercise-obscureobsoletes-11-test.out
@@ -19,5 +19,5 @@ fff-1.0-1[test]:  needed by  [ggg-1.0-1]
 Installing fff-1.0-1[test]
 eee-1.0-1[test]:  needed by  [hhh-1.0-1]
 Installing eee-1.0-1[test]
-[ERROR] A conflict over  eee (eee-1.0-1) requires the removal of the to-be-installed resolvable eee-1.0-1[test] [fff-1.0-1]
+[ERROR] A conflict over  eee (eee-1.0-1) requires the removal of the to-be-installed resItem eee-1.0-1[test] [fff-1.0-1]
 [ERROR] Marking this resolution attempt as invalid.