[Aptitude-devel] r3145 - in branches/aptitude-0.3/aptitude: . src/generic

Daniel Burrows dburrows@costa.debian.org
Wed, 27 Apr 2005 13:12:06 +0000


Author: dburrows
Date: Wed Apr 27 13:12:02 2005
New Revision: 3145

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/aptcache.cc
Log:
Decrease the default search limit.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Wed Apr 27 13:12:02 2005
@@ -1,5 +1,10 @@
 2005-04-27  Daniel Burrows  <dburrows@debian.org>
 
+	* src/generic/aptcache.cc:
+
+	  Decrease the default step size so that hard-to-resolve problems
+	  don't cause aptitude to lock up.
+
 	* src/vscreen/config/keybindings.cc, src/vscreen/keybindings.h:
 
 	  Make a global readable_keyname as well.

Modified: branches/aptitude-0.3/aptitude/src/generic/aptcache.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/aptcache.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/generic/aptcache.cc	Wed Apr 27 13:12:02 2005
@@ -1451,7 +1451,7 @@
     {
       try
 	{
-	  solutions.push_back(new aptitude_resolver::solution(resolver->find_next_solution(aptcfg->FindI(PACKAGE "::ProblemResolver::StepLimit", 10000))));
+	  solutions.push_back(new aptitude_resolver::solution(resolver->find_next_solution(aptcfg->FindI(PACKAGE "::ProblemResolver::StepLimit", 1000))));
 	  selected_solution=0;
 	  out_of_time=false;
 	  selected_solution_changed();