From b84e7ef1a3e07105cea2eabe12a36eb5a3b6e454 Mon Sep 17 00:00:00 2001
From: Stefan Schubert <schubi@suse.de>
Date: Tue, 31 Jul 2007 08:37:02 +0000
Subject: [PATCH] Removed keepExtras from resolvePool

---
 zypp/Resolver.cc               |  4 ++--
 zypp/Resolver.h                |  2 +-
 zypp/solver/detail/Resolver.cc | 10 ++++------
 zypp/solver/detail/Resolver.h  |  2 +-
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/zypp/Resolver.cc b/zypp/Resolver.cc
index 61062de..c34afec 100644
--- a/zypp/Resolver.cc
+++ b/zypp/Resolver.cc
@@ -66,8 +66,8 @@ namespace zypp
   { return _pimpl->freshenPool(); }
   bool Resolver::resolvePool ()
   { return _pimpl->resolvePool( false ); }// do not try all possibilities 
-  bool Resolver::resolvePool( bool tryAllPossibilities, bool keepExtras )
-  { return _pimpl->resolvePool( tryAllPossibilities, keepExtras ); }
+  bool Resolver::resolvePool( bool tryAllPossibilities)
+  { return _pimpl->resolvePool( tryAllPossibilities); }
   bool Resolver::resolveDependencies( void )
   { return _pimpl->resolveDependencies( ); }
   void Resolver::undo()
diff --git a/zypp/Resolver.h b/zypp/Resolver.h
index a84b005..078d242 100644
--- a/zypp/Resolver.h
+++ b/zypp/Resolver.h
@@ -127,7 +127,7 @@ namespace zypp
      * the latter case, use problems() and later applySolutions()
      * below.
      **/
-    bool resolvePool (bool tryAllPossibilities, bool keepExtras = false );
+    bool resolvePool (bool tryAllPossibilities);
       
     bool resolveDependencies( void );
 
diff --git a/zypp/solver/detail/Resolver.cc b/zypp/solver/detail/Resolver.cc
index 1536c42..348a7d0 100644
--- a/zypp/solver/detail/Resolver.cc
+++ b/zypp/solver/detail/Resolver.cc
@@ -668,8 +668,7 @@ Resolver::establishState( ResolverContext_Ptr context )
 
 	// process the queue
 	resolveDependencies( context );
-
-	reset();
+	reset( false, true ); //resetValidResults,keepExtras
     }
 
     context->setEstablishing (false);
@@ -797,7 +796,7 @@ Resolver::freshenState( ResolverContext_Ptr context,
     resolveDependencies( context );
     
     if (resetAfterSolve) {
-	reset();
+	reset( false, true ); //resetValidResults,keepExtras	
 	context->setEstablishing( false );
 	_best_context = context;
     }
@@ -1216,14 +1215,13 @@ show_pool( ResPool pool )
 
 
 bool
-Resolver::resolvePool( bool tryAllPossibilities, bool keepExtras )
+Resolver::resolvePool( bool tryAllPossibilities )
 {
     ResolverContext_Ptr saveContext = _best_context;
     CollectTransact info (*this);
 
     // cleanup before next run
-    reset( false, keepExtras );
-
+    reset( false, true ); //resetValidResults,keepExtras
     bool saveTryAllPossibilities = _tryAllPossibilities;
 
     if (tryAllPossibilities) {
diff --git a/zypp/solver/detail/Resolver.h b/zypp/solver/detail/Resolver.h
index 9a72aec..1885b43 100644
--- a/zypp/solver/detail/Resolver.h
+++ b/zypp/solver/detail/Resolver.h
@@ -247,7 +247,7 @@ class Resolver : public base::ReferenceCounted, private base::NonCopyable {
     void freshenState( ResolverContext_Ptr context = NULL, bool resetAfterSolve = true );
     bool freshenPool( bool resetAfterSolve = true );
     bool resolveDependencies (const ResolverContext_Ptr context = NULL);
-    bool resolvePool( bool tryAllPossibilities = false, bool keepExtras = false );
+    bool resolvePool( bool tryAllPossibilities = false);
 
     bool transactResObject( ResObject::constPtr robj,
 			    bool install = true,
-- 
2.7.4