From: Stefan Schubert <schubi@suse.de>
Date: Tue, 1 Apr 2008 13:31:29 +0000 (+0000)
Subject: take care about the forceResolve in the testcases
X-Git-Tag: 6.6.0~1193
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d6bd848c0219700306b687eed2d16e6d72591d64;p=platform%2Fupstream%2Flibzypp.git

take care about the forceResolve in the testcases
---

diff --git a/zypp/solver/detail/Testcase.cc b/zypp/solver/detail/Testcase.cc
index 42e02cbdc..58eac7d1e 100644
--- a/zypp/solver/detail/Testcase.cc
+++ b/zypp/solver/detail/Testcase.cc
@@ -378,7 +378,9 @@ bool Testcase::createTestcase(Resolver & resolver, bool dumpPool, bool runSolver
     HelixControl control (dumpPath + "/solver-test.xml",
 			  repoTable,
 			  ZConfig::instance().systemArchitecture(),
-			  pool.getRequestedLocales());
+			  pool.getRequestedLocales(),
+			  "solver-system.xml.gz",
+			  resolver.forceResolve());
 
     for (PoolItemList::const_iterator iter = items_to_install.begin(); iter != items_to_install.end(); iter++) {
 	control.installResolvable (iter->resolvable(), iter->status());
@@ -432,7 +434,8 @@ HelixControl::HelixControl(const std::string & controlPath,
 			   const RepositoryTable & repoTable,
 			   const Arch & systemArchitecture,
 			   const LocaleSet &languages,
-			   const std::string & systemPath)
+			   const std::string & systemPath,
+			   const bool forceResolve)
     :dumpFile (controlPath)
 {
     file = new ofstream(controlPath.c_str());
@@ -468,6 +471,10 @@ HelixControl::HelixControl(const std::string & controlPath,
 	*file << TAB << "<locale name=\"" <<  iter->code()
 	      << "\" />" << endl;
     }
+    
+    if (forceResolve)
+	*file << TAB << "<forceResolve/>" << endl;
+    
     *file << "</setup>" << endl
 	  << "<trial>" << endl
 	  << "<showpool all=\"yes\"/>" << endl;
diff --git a/zypp/solver/detail/Testcase.h b/zypp/solver/detail/Testcase.h
index 9ee42540d..8176c6446 100644
--- a/zypp/solver/detail/Testcase.h
+++ b/zypp/solver/detail/Testcase.h
@@ -103,7 +103,8 @@ class  HelixControl {
 		  const RepositoryTable & sourceTable,
 		  const Arch & systemArchitecture,
 		  const LocaleSet &languages,		  
-		  const std::string & systemPath = "solver-system.xml.gz");
+		  const std::string & systemPath = "solver-system.xml.gz",
+		  const bool forceResolve = false);
     HelixControl ();    
     ~HelixControl ();