[Aptitude-svn-commit] r4083 - in branches/aptitude-0.3/aptitude: . src/generic

[Daniel Burrows]

Author: dburrows
Date: Wed Sep 14 20:21:31 2005
New Revision: 4083

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/resolver_manager.cc
Log:
Don't try to create a resolver when one already exists.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Wed Sep 14 20:21:31 2005
@@ -1,5 +1,12 @@
 2005-09-14  Daniel Burrows  <dburrows at debian.org>
 
+	* src/generic/resolver_manager.cc:
+
+	  In maybe_create_resolver, don't try to create a resolver unless
+	  none exists (sometimes maybe_create_resolver is called
+	  unnecessarily, because nothing actually changed and the resolver
+	  wasn't discarded).
+
 	* src/broken_indicator.cc, src/cmdline/cmdline_prompt.cc, src/cmdline/cmdline_resolver.cc, src/generic/aptcache.cc, src/generic/aptcache.h, src/generic/apt.cc, src/generic/apt.h, src/generic/Makefile.am, src/generic/resolver_manager.cc, src/generic/resolver_manager.h, src/solution_dialog.cc, src/solution_screen.cc, src/ui.cc:
 
 	  Factor the resolver management functions of the cache file out

Modified: branches/aptitude-0.3/aptitude/src/generic/resolver_manager.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/resolver_manager.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/generic/resolver_manager.cc	Wed Sep 14 20:21:31 2005
@@ -49,7 +49,7 @@
 
 void resolver_manager::maybe_create_resolver()
 {
-  if(cache->BrokenCount() > 0)
+  if(resolver == NULL && cache->BrokenCount() > 0)
     create_resolver();
 }