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

[Daniel Burrows]

Author: dburrows
Date: Thu Aug 18 22:09:37 2005
New Revision: 3918

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/solution_screen.cc
Log:
Fix how the curses UI displays removal-cancellation in 'story' mode.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Thu Aug 18 22:09:37 2005
@@ -1,5 +1,10 @@
 2005-08-18  Daniel Burrows  <dburrows at debian.org>
 
+	* src/solution_screen.cc:
+
+	  Fix the text displayed for a 'story' in the curses interface
+	  when a package's removal is going to be cancelled.
+
 	* doc/en/aptitude.xml:
 
 	  Start updating the documentation for the next version: fix some

Modified: branches/aptitude-0.3/aptitude/src/solution_screen.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/solution_screen.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/solution_screen.cc	Thu Aug 18 22:09:37 2005
@@ -352,6 +352,9 @@
 	if(ver.get_ver().end())
 	  f = fragf(_("Cancel the installation of %F"),
 		    text_fragment(pkg.Name(), style_attrs_on(A_BOLD)));
+	else if(ver.get_package().current_version().get_ver().end())
+	  f = fragf(_("Cancel the removal of %F"),
+		    text_fragment(pkg.Name(), style_attrs_on(A_BOLD)));
 	else
 	  f = fragf(_("Keep %F at version %s (%s)"),
 		    text_fragment(pkg.Name(), style_attrs_on(A_BOLD)),