forceResolve for ZMD

diff --git a/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-03-force-test.solution b/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-03-force-test.solution
new file mode 100644 (file)
index 0000000..e2dad1b
--- /dev/null
+++ b/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-03-force-test.solution
@@ -0,0 +1,6 @@
+>!> Installing bar from channel test
+>!> Solution #1:
+>!> install bar-2.0-1[test]
+>!> remove  foo-1.0-1
+>!> |unflag foo-2.0-1[test]
+>!> installs=1, upgrades=0, uninstalls=1

diff --git a/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-03-force-test.xml b/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-03-force-test.xml
index ce7413c..d47c2c9 100644 (file)
--- a/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-03-force-test.xml
+++ b/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-03-force-test.xml
@@ -3,6 +3,7 @@
 <setup>
   <system file="exercise-02conflict-system.xml"/>
   <channel name="test" file="exercise-02conflict-packages.xml"/>
+  <forceResolve/>
 </setup>
 
 

diff --git a/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-05-force-test.solution b/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-05-force-test.solution
new file mode 100644 (file)
index 0000000..570467a
--- /dev/null
+++ b/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-05-force-test.solution
@@ -0,0 +1,5 @@
+>!> Installing libc6 from channel test
+>!> Solution #1:
+>!> remove  smail-1.0-1
+>!> upgrade libc6-2.0.7-2 => libc6-2.1.0-1[test]
+>!> installs=0, upgrades=1, uninstalls=1

diff --git a/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-05-force-test.xml b/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-05-force-test.xml
index f820f9f..ff88d9b 100644 (file)
--- a/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-05-force-test.xml
+++ b/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-05-force-test.xml
@@ -3,6 +3,7 @@
 <setup>
   <system file="exercise-02conflict-system.xml"/>
   <channel name="test" file="exercise-02conflict-packages.xml"/>
+  <forceResolve/>
 </setup>
 
 

diff --git a/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-06-force-test.solution b/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-06-force-test.solution
new file mode 100644 (file)
index 0000000..e799331
--- /dev/null
+++ b/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-06-force-test.solution
@@ -0,0 +1,7 @@
+>!> Installing test3 from channel test
+>!> Solution #1:
+>!> install test3-1.0-1[test]
+>!> remove  test1-1.0-1
+>!> remove  test2-1.0-1
+>!> |unflag test4-1.0-1[test]
+>!> installs=1, upgrades=0, uninstalls=2

diff --git a/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-06-force-test.xml b/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-06-force-test.xml
index 1a76e46..4753719 100644 (file)
--- a/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-06-force-test.xml
+++ b/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-06-force-test.xml
@@ -3,6 +3,7 @@
 <setup>
   <system file="exercise-02conflict-system.xml"/>
   <channel name="test" file="exercise-02conflict-packages.xml"/>
+  <forceResolve/>
 </setup>
 
 

diff --git a/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-07-force-test.solution b/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-07-force-test.solution
new file mode 100644 (file)
index 0000000..3f8724d
--- /dev/null
+++ b/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-07-force-test.solution
@@ -0,0 +1,6 @@
+>!> Installing test4 from channel test
+>!> Solution #1:
+>!> install test4-1.0-1[test]
+>!> remove  test2-1.0-1
+>!> |unflag test3-1.0-1[test]
+>!> installs=1, upgrades=0, uninstalls=1

diff --git a/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-07-force-test.xml b/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-07-force-test.xml
index e3ac661..98785f2 100644 (file)
--- a/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-07-force-test.xml
+++ b/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-07-force-test.xml
@@ -3,6 +3,7 @@
 <setup>
   <system file="exercise-02conflict-system.xml"/>
   <channel name="test" file="exercise-02conflict-packages.xml"/>
+  <forceResolve/>
 </setup>
 
 

diff --git a/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-08-force-test.solution b/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-08-force-test.solution
new file mode 100644 (file)
index 0000000..e137c17
--- /dev/null
+++ b/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-08-force-test.solution
@@ -0,0 +1,10 @@
+>!> Installing baz from channel test
+>!> Solution #1:
+>!> install baz-1.0-1[test]
+>!> upgrade foo-1.0-1 => foo-2.0-1[test]
+>!> |unflag bar-2.0-1[test]
+>!> installs=1, upgrades=1, uninstalls=0
+>!> Solution #2:
+>!> install baz-1.0-1[test]
+>!> remove  foo-1.0-1
+>!> installs=1, upgrades=0, uninstalls=1

diff --git a/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-08-force-test.xml b/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-08-force-test.xml
index 609589e..af5e5b8 100644 (file)
--- a/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-08-force-test.xml
+++ b/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-08-force-test.xml
@@ -3,6 +3,7 @@
 <setup>
   <system file="exercise-02conflict-system.xml"/>
   <channel name="test" file="exercise-02conflict-packages.xml"/>
+  <forceResolve/>
 </setup>
 
 

diff --git a/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-09-force-test.solution b/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-09-force-test.solution
new file mode 100644 (file)
index 0000000..c1397be
--- /dev/null
+++ b/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-09-force-test.solution
@@ -0,0 +1,6 @@
+>!> Installing baz2 from channel test
+>!> No problems so far
+>!> Solution #1:
+>!> install baz2-1.0-1[test]
+>!> remove  foo2-1.0-1
+>!> installs=1, upgrades=0, uninstalls=1

diff --git a/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-09-force-test.xml b/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-09-force-test.xml
index a110de8..5c416ca 100644 (file)
--- a/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-09-force-test.xml
+++ b/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-09-force-test.xml
@@ -3,6 +3,7 @@
 <setup>
   <system file="exercise-02conflict-system.xml"/>
   <channel name="test" file="exercise-02conflict-packages.xml"/>
+  <forceResolve/>
 </setup>
 
 

diff --git a/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-13-force-test.solution b/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-13-force-test.solution
new file mode 100644 (file)
index 0000000..c05e1c4
--- /dev/null
+++ b/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-13-force-test.solution
@@ -0,0 +1,5 @@
+>!> Installing required3 from channel test
+>!> Solution #1:
+>!> remove  requirerer3-2.0-1
+>!> upgrade required3-1.0-1 => required3-2.0-1[test]
+>!> installs=0, upgrades=1, uninstalls=1

diff --git a/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-13-force-test.xml b/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-13-force-test.xml
index 2f948be..3f5fe40 100644 (file)
--- a/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-13-force-test.xml
+++ b/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-13-force-test.xml
@@ -3,6 +3,7 @@
 <setup>
   <system file="exercise-02conflict-system.xml"/>
   <channel name="test" file="exercise-02conflict-packages.xml"/>
+  <forceResolve/>
 </setup>
 
 <!-- eek... this time a downgrade is available :-) -->

diff --git a/testsuite/solver/data.deptestomatic/yast-tests/exercise-04obsoletes-04-force-test.solution b/testsuite/solver/data.deptestomatic/yast-tests/exercise-04obsoletes-04-force-test.solution
new file mode 100644 (file)
index 0000000..77783c8
--- /dev/null
+++ b/testsuite/solver/data.deptestomatic/yast-tests/exercise-04obsoletes-04-force-test.solution
@@ -0,0 +1,6 @@
+>!> Installing libfoo2 from channel test
+>!> Solution #1:
+>!> install libfoo2-2.0-1[test]
+>!> remove  libfoo-1.2-1
+>!> remove  something-1.0-1
+>!> installs=1, upgrades=0, uninstalls=2

diff --git a/testsuite/solver/data.deptestomatic/yast-tests/exercise-04obsoletes-04-force-test.xml b/testsuite/solver/data.deptestomatic/yast-tests/exercise-04obsoletes-04-force-test.xml
index 10654e1..09f36f2 100644 (file)
--- a/testsuite/solver/data.deptestomatic/yast-tests/exercise-04obsoletes-04-force-test.xml
+++ b/testsuite/solver/data.deptestomatic/yast-tests/exercise-04obsoletes-04-force-test.xml
@@ -3,6 +3,7 @@
 <setup>
   <system file="exercise-04obsoletes-system.xml"/>
   <channel name="test" file="exercise-04obsoletes-packages.xml"/>
+  <forceResolve/>
 </setup>
 
 <!-- 

diff --git a/testsuite/solver/data.deptestomatic/yast-tests/exercise-alternatives-3-force-test.solution b/testsuite/solver/data.deptestomatic/yast-tests/exercise-alternatives-3-force-test.solution
new file mode 100644 (file)
index 0000000..08ecc23
--- /dev/null
+++ b/testsuite/solver/data.deptestomatic/yast-tests/exercise-alternatives-3-force-test.solution
@@ -0,0 +1,25 @@
+>!> Installing alt-conflict from channel test
+>!> Solution #1:
+>!> install WindowMaker-1.0-1[test]
+>!> install alt-conflict-1.0-1[test]
+>!> install sendmail-1.0-1[test]
+>!> remove  foo-1.0-1
+>!> installs=3, upgrades=0, uninstalls=1
+>!> Solution #2:
+>!> install alt-conflict-1.0-1[test]
+>!> install icewm-1.0-1[test]
+>!> install sendmail-1.0-1[test]
+>!> remove  foo-1.0-1
+>!> installs=3, upgrades=0, uninstalls=1
+>!> Solution #3:
+>!> install WindowMaker-1.0-1[test]
+>!> install alt-conflict-1.0-1[test]
+>!> install postfix-1.0-1[test]
+>!> remove  foo-1.0-1
+>!> installs=3, upgrades=0, uninstalls=1
+>!> Solution #4:
+>!> install alt-conflict-1.0-1[test]
+>!> install icewm-1.0-1[test]
+>!> install postfix-1.0-1[test]
+>!> remove  foo-1.0-1
+>!> installs=3, upgrades=0, uninstalls=1

diff --git a/testsuite/solver/data.deptestomatic/yast-tests/exercise-alternatives-3-force-test.xml b/testsuite/solver/data.deptestomatic/yast-tests/exercise-alternatives-3-force-test.xml
index 7446866..6605e0b 100644 (file)
--- a/testsuite/solver/data.deptestomatic/yast-tests/exercise-alternatives-3-force-test.xml
+++ b/testsuite/solver/data.deptestomatic/yast-tests/exercise-alternatives-3-force-test.xml
@@ -3,6 +3,7 @@
 <setup>
   <system file="exercise-alternatives-system.xml"/>
   <channel name="test" file="exercise-alternatives-packages.xml"/>
+  <forceResolve/>
 </setup>
 
 <!-- 

diff --git a/testsuite/solver/data.deptestomatic/yast-tests/exercise-inconsistent2-force-test.solution b/testsuite/solver/data.deptestomatic/yast-tests/exercise-inconsistent2-force-test.solution
new file mode 100644 (file)
index 0000000..0d3c537
--- /dev/null
+++ b/testsuite/solver/data.deptestomatic/yast-tests/exercise-inconsistent2-force-test.solution
@@ -0,0 +1,4 @@
+>!> Solution #1:
+>!> remove  at-1-1
+>!> remove  shadow-1.0-1
+>!> installs=0, upgrades=0, uninstalls=2

diff --git a/testsuite/solver/data.deptestomatic/yast-tests/exercise-inconsistent2-force-test.xml b/testsuite/solver/data.deptestomatic/yast-tests/exercise-inconsistent2-force-test.xml
index 25240d7..f28b78f 100644 (file)
--- a/testsuite/solver/data.deptestomatic/yast-tests/exercise-inconsistent2-force-test.xml
+++ b/testsuite/solver/data.deptestomatic/yast-tests/exercise-inconsistent2-force-test.xml
@@ -3,6 +3,7 @@
 <setup>
   <system file="exercise-inconsistent2-system.xml"/>
   <channel name="test" file="exercise-inconsistent2-packages.xml"/>
+  <forceResolve/>
 </setup>
 
 <!-- 

diff --git a/testsuite/solver/data.deptestomatic/yast-tests/exercise-inconsistent4-force-test.solution b/testsuite/solver/data.deptestomatic/yast-tests/exercise-inconsistent4-force-test.solution
new file mode 100644 (file)
index 0000000..0d3c537
--- /dev/null
+++ b/testsuite/solver/data.deptestomatic/yast-tests/exercise-inconsistent4-force-test.solution
@@ -0,0 +1,4 @@
+>!> Solution #1:
+>!> remove  at-1-1
+>!> remove  shadow-1.0-1
+>!> installs=0, upgrades=0, uninstalls=2

diff --git a/testsuite/solver/data.deptestomatic/yast-tests/exercise-inconsistent4-force-test.xml b/testsuite/solver/data.deptestomatic/yast-tests/exercise-inconsistent4-force-test.xml
index f3ee144..2ebb359 100644 (file)
--- a/testsuite/solver/data.deptestomatic/yast-tests/exercise-inconsistent4-force-test.xml
+++ b/testsuite/solver/data.deptestomatic/yast-tests/exercise-inconsistent4-force-test.xml
@@ -3,6 +3,7 @@
 <setup>
   <system file="exercise-inconsistent4-system.xml"/>
   <channel name="test" file="exercise-inconsistent4-packages.xml"/>
+  <forceResolve/>
 </setup>
 
 <!-- 

diff --git a/testsuite/solver/data.deptestomatic/yast-tests/exercise-inconsistent6-force-test.solution b/testsuite/solver/data.deptestomatic/yast-tests/exercise-inconsistent6-force-test.solution
new file mode 100644 (file)
index 0000000..99b2d11
--- /dev/null
+++ b/testsuite/solver/data.deptestomatic/yast-tests/exercise-inconsistent6-force-test.solution
@@ -0,0 +1,3 @@
+>!> Solution #1:
+>!> remove  kaffeine-2-1
+>!> installs=0, upgrades=0, uninstalls=1

diff --git a/testsuite/solver/data.deptestomatic/yast-tests/exercise-inconsistent6-force-test.xml b/testsuite/solver/data.deptestomatic/yast-tests/exercise-inconsistent6-force-test.xml
index 1116fa1..c2ecc77 100644 (file)
--- a/testsuite/solver/data.deptestomatic/yast-tests/exercise-inconsistent6-force-test.xml
+++ b/testsuite/solver/data.deptestomatic/yast-tests/exercise-inconsistent6-force-test.xml
@@ -3,6 +3,7 @@
 <setup>
   <system file="exercise-inconsistent6-system.xml"/>
   <channel name="test" file="exercise-inconsistent6-packages.xml"/>
+  <forceResolve/>
 </setup>
 
 <!-- 

diff --git a/testsuite/solver/data.deptestomatic/yast-tests/exercise-kdelibsobs-force-test.solution b/testsuite/solver/data.deptestomatic/yast-tests/exercise-kdelibsobs-force-test.solution
new file mode 100644 (file)
index 0000000..3831f49
--- /dev/null
+++ b/testsuite/solver/data.deptestomatic/yast-tests/exercise-kdelibsobs-force-test.solution
@@ -0,0 +1,9 @@
+>!> Installing kdelibs3-devel from channel test
+>!> Installing kdelibs3 from channel test
+>!> Solution #1:
+>!> install kdelibs3-EDITION-UNSPEC[test]
+>!> install kdelibs3-devel-EDITION-UNSPEC[test]
+>!> remove  kdelibs-devel-2.0.1-4
+>!> remove  kdesupport-2.0.1-5
+>!> remove  kdesupport-devel-2.0.1-5
+>!> installs=2, upgrades=0, uninstalls=3

diff --git a/testsuite/solver/data.deptestomatic/yast-tests/exercise-kdelibsobs-force-test.xml b/testsuite/solver/data.deptestomatic/yast-tests/exercise-kdelibsobs-force-test.xml
index 222e232..6207f4f 100644 (file)
--- a/testsuite/solver/data.deptestomatic/yast-tests/exercise-kdelibsobs-force-test.xml
+++ b/testsuite/solver/data.deptestomatic/yast-tests/exercise-kdelibsobs-force-test.xml
@@ -3,6 +3,7 @@
 <setup>
   <system file="exercise-kdelibsobs-system.xml"/>
   <channel name="test" file="exercise-kdelibsobs-packages.xml"/>
+  <forceResolve/>
 </setup>
 
 <!-- 

diff --git a/testsuite/solver/data.deptestomatic/yast-tests/exercise-obscureobsoletes-05-force-test.solution b/testsuite/solver/data.deptestomatic/yast-tests/exercise-obscureobsoletes-05-force-test.solution
new file mode 100644 (file)
index 0000000..48799cc
--- /dev/null
+++ b/testsuite/solver/data.deptestomatic/yast-tests/exercise-obscureobsoletes-05-force-test.solution
@@ -0,0 +1,6 @@
+>!> Installing barold2 from channel test
+>!> Solution #1:
+>!> install barold2-4.0-1[test]
+>!> remove  bar2-1.0-1
+>!> remove  bar2-devel-1.1-1
+>!> installs=1, upgrades=0, uninstalls=2

diff --git a/testsuite/solver/data.deptestomatic/yast-tests/exercise-obscureobsoletes-05-force-test.xml b/testsuite/solver/data.deptestomatic/yast-tests/exercise-obscureobsoletes-05-force-test.xml
index 7ec6028..14eb492 100644 (file)
--- a/testsuite/solver/data.deptestomatic/yast-tests/exercise-obscureobsoletes-05-force-test.xml
+++ b/testsuite/solver/data.deptestomatic/yast-tests/exercise-obscureobsoletes-05-force-test.xml
@@ -3,6 +3,7 @@
 <setup>
   <system file="exercise-obscureobsoletes-system.xml"/>
   <channel name="test" file="exercise-obscureobsoletes-packages.xml"/>
+  <forceResolve/>
 </setup>
 
 <!-- 

diff --git a/testsuite/solver/data.deptestomatic/yast-tests/ignore b/testsuite/solver/data.deptestomatic/yast-tests/ignore
index 0b66e80..cdccc98 100644 (file)
--- a/testsuite/solver/data.deptestomatic/yast-tests/ignore
+++ b/testsuite/solver/data.deptestomatic/yast-tests/ignore
@@ -6,19 +6,5 @@ exercise-obscureobsoletes-06-test.xml
 exercise-05reallive-4-test.xml
 #solution ordering is not the same
 exercise-alternatives-1-test.xml
-#no solution available
-exercise-02conflict-03-force-test.xml
-exercise-02conflict-08-force-test.xml
-exercise-alternatives-3-force-test.xml
-exercise-kdelibsobs-force-test.xml
-exercise-02conflict-05-force-test.xml
-exercise-02conflict-09-force-test.xml
-exercise-inconsistent2-force-test.xml
-exercise-obscureobsoletes-05-force-test.xml
-exercise-02conflict-06-force-test.xml
-exercise-02conflict-13-force-test.xml
-exercise-inconsistent4-force-test.xml
-exercise-02conflict-07-force-test.xml
-exercise-04obsoletes-04-force-test.xml
-exercise-inconsistent6-force-test.xml
 exercise-04obsoletes-03-test.xml
+exercise-alternatives-3-force-test.xml

diff --git a/testsuite/solver/src/deptestomatic.cc b/testsuite/solver/src/deptestomatic.cc
index a9ed8c9..75ec04b 100644 (file)
--- a/testsuite/solver/src/deptestomatic.cc
+++ b/testsuite/solver/src/deptestomatic.cc
@@ -92,6 +92,7 @@ static string globalPath;
 
 static ZYpp::Ptr God;
 static SourceManager_Ptr manager;
+static bool forceResolve;
 
 typedef list<unsigned int> ChecksumList;
 
@@ -638,8 +639,10 @@ parse_xml_setup (XmlNode_Ptr node)
            node = node->next();
            continue;
        }
-
-       if (node->equals ("system")) {
+       if (node->equals ("forceResolve")) {
+            
+            forceResolve = true;
+        } else if (node->equals ("system")) {
 
            string file = node->getProp ("file");
            load_source ("@system", file, "helix", true);
@@ -946,6 +949,8 @@ parse_xml_trial (XmlNode_Ptr node, const ResPool & pool)
 
     solver::detail::Resolver_Ptr resolver = new solver::detail::Resolver (pool);
 
+    resolver->setForceResolve (forceResolve);
+
     ResolverContext_Ptr established = NULL;
 
     node = node->children();
@@ -1324,7 +1329,7 @@ main (int argc, char *argv[])
        cerr << "Usage: deptestomatic testfile.xml" << endl;
        exit (0);
     }
-
+    forceResolve = false;
     manager = SourceManager::sourceManager();
     ZYppFactory zf;
     God = zf.getZYpp();