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

[Daniel Burrows]

Author: dburrows
Date: Sun May  1 14:22:02 2005
New Revision: 3225

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/cmdline/cmdline_prompt.cc
Log:
Always prompt to resolve deps if some packages are broken.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sun May  1 14:22:02 2005
@@ -1,5 +1,12 @@
 2005-05-01  Daniel Burrows  <dburrows@debian.org>
 
+	* src/cmdline/cmdline_prompt.cc:
+
+	  Before, if the list of actions had not been modified by the time
+	  they were displayed, the prompt would be skipped even if some
+	  packages were broken.  Now, if packages are broken, we always
+	  continue to the prompt (including the resolver).
+
 	* doc/en/aptitude.xml:
 
 	  Finish documenting the new configuration options.

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	Sun May  1 14:22:02 2005
@@ -641,7 +641,8 @@
       if(!cmdline_show_preview(true, to_install, to_hold, to_remove,
 			       showvers, showdeps, showsize, verbose) &&
 	 first &&
-	 !always_prompt)
+	 !always_prompt &&
+	 (*apt_cache_file)->BrokenCount()==0)
 	cont=true;
       else if((*apt_cache_file)->resolver_exists())
 	{