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

[Daniel Burrows]

Author: dburrows
Date: Thu Sep 22 05:41:00 2005
New Revision: 4166

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/ui.cc
Log:
Call the new maybe-blocking solution fetcher.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Thu Sep 22 05:41:00 2005
@@ -1,5 +1,9 @@
 2005-09-21  Daniel Burrows  <dburrows at debian.org>
 
+	* src/ui.cc:
+
+	  Use the new maybe-blocking solution fetching routine.
+
 	* src/generic/resolver_manager.cc:
 
 	  Add support for cancelling a suspension before destroying the

Modified: branches/aptitude-0.3/aptitude/src/ui.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/ui.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/ui.cc	Thu Sep 22 05:41:00 2005
@@ -1507,9 +1507,10 @@
   if(state.resolver_exists &&
      state.selected_solution == state.generated_solutions &&
      !state.background_thread_active)
-    resman->get_solution_background(resman->get_selected_solution(),
-				    aptcfg->FindI(PACKAGE "::ProblemResolver::StepLimit", 5000),
-				    new interactive_continuation(resman));
+    resman->get_solution_background_blocking(resman->get_selected_solution(),
+					     aptcfg->FindI(PACKAGE "::ProblemResolver::StepLimit", 5000),
+					     aptcfg->FindI(PACKAGE "::ProblemResolver::WaitSteps", 50),
+					     new interactive_continuation(resman));
 }
 
 static void do_connect_resolver_callback()