[Aptitude-devel] r3211 - in branches/aptitude-0.3/aptitude: . src/cmdline

Daniel Burrows dburrows@costa.debian.org
Sat, 30 Apr 2005 23:20:44 +0000


Author: dburrows
Date: Sat Apr 30 23:20:39 2005
New Revision: 3211

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/cmdline/cmdline_do_action.cc
Log:
Get rid of the separate resolve step prior to displaying the prompt.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sat Apr 30 23:20:39 2005
@@ -1,5 +1,10 @@
 2005-04-30  Daniel Burrows  <dburrows@debian.org>
 
+	* src/cmdline/cmdline_do_action.cc:
+
+	  Get rid of the separate resolve step prior to prompting, which
+	  should make the command-line interaction a bit nicer.
+
 	* src/cmdline/cmdline_prompt.cc:
 
 	  Display the prompt help using fragments, so it gets properly

Modified: branches/aptitude-0.3/aptitude/src/cmdline/cmdline_do_action.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/cmdline_do_action.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/cmdline_do_action.cc	Sat Apr 30 23:20:39 2005
@@ -186,20 +186,6 @@
     }
   (*apt_cache_file)->end_action_group(NULL);
 
-
-  cmdline_resolve_deps(to_install,
-		       to_hold,
-		       to_remove,
-		       to_purge,
-		       assume_yes,
-		       !fix_broken,
-		       verbose);
-
-  _error->DumpErrors();
-
-  if(!show_broken())
-    return -1;
-
   if(visual_preview)
     {
       ui_preview();