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

[Daniel Burrows]

Author: dburrows
Date: Sat Apr 30 23:34:32 2005
New Revision: 3213

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/cmdline/cmdline_prompt.cc
Log:
Always show a preview before asking the user whether they want to continue.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sat Apr 30 23:34:32 2005
@@ -1,5 +1,11 @@
 2005-04-30  Daniel Burrows  <dburrows@debian.org>
 
+	* src/cmdline/cmdline_prompt.cc:
+
+	  After running the resolver, always fall out to the main loop, so
+	  that a new preview gets displayed before the prompt is shown
+	  again.
+
 	* src/cmdline/cmdline_download.cc, src/cmdline/cmdline_progress.cc, src/cmdline/cmdline_prompt.cc, src/cmdline/cmdline_resolver.cc, src/cmdline/cmdline_search.cc, src/cmdline/cmdline_show.cc, src/main.cc:
 
 	  Quit running update_screen_width all over the place in

Modified: branches/aptitude-0.3/aptitude/src/cmdline/cmdline_prompt.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/cmdline_prompt.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/cmdline_prompt.cc	Sat Apr 30 23:34:32 2005
@@ -643,16 +643,19 @@
 	 first &&
 	 !always_prompt)
 	cont=true;
-      else if(!cmdline_resolve_deps(to_install,
-				    to_hold,
-				    to_remove,
-				    to_purge,
-				    assume_yes,
-				    force_no_change,
-				    verbose))
+      else if((*apt_cache_file)->resolver_exists())
 	{
-	  cont=true;
-	  rval=false;
+	  if(!cmdline_resolve_deps(to_install,
+				   to_hold,
+				   to_remove,
+				   to_purge,
+				   assume_yes,
+				   force_no_change,
+				   verbose))
+	    {
+	      cont=true;
+	      rval=false;
+	    }
 	}
       else if(assume_yes)
 	cont=true;