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

[Daniel Burrows]

Author: dburrows
Date: Sat Apr 30 18:59:06 2005
New Revision: 3203

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/cmdline/cmdline_resolver.cc
Log:
Fix the formatting of the (command-line) resolver help text.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sat Apr 30 18:59:06 2005
@@ -1,5 +1,10 @@
 2005-04-30  Daniel Burrows  <dburrows@debian.org>
 
+	* src/cmdline/cmdline_resolver.cc:
+
+	  Fix some of the formatting problems with the resolver help text.
+	  Introduce help for not-yet-extant commands.
+
 	* src/generic/aptcache.cc, src/generic/aptcache.h, src/generic/problemresolver/problemresolver.h:
 
 	  Add support in the cache abstraction for dumping the resolver

Modified: branches/aptitude-0.3/aptitude/src/cmdline/cmdline_resolver.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/cmdline_resolver.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/cmdline_resolver.cc	Sat Apr 30 18:59:06 2005
@@ -78,24 +78,46 @@
     }
 }
 
+static fragment *flowindentbox(int i1, int irest, fragment *f)
+{
+  return flowbox(indentbox(i1, irest, f));
+}
+
 static void resolver_help(ostream &out)
 {
   fragment *f=flowbox(indentbox(2, 2,
-				fragf(_("y: %F%n"
-					"n: %F%n"
-					"q: %F%n"
-					",: %F%n"
-					".: %F%n"),
-				      indentbox(0, 3,
+				fragf(_("y: %F"
+					"n: %F"
+					"q: %F"
+					",: %F"
+					".: %F"
+					"<ACTION> pkg... : %F%n"
+					"%F"
+					"%F"
+					"%F"
+					"%F"),
+				      flowindentbox(0, 3,
 						fragf(_("accept the proposed changes"))),
-				      indentbox(0, 3,
+				      flowindentbox(0, 3,
 						fragf(_("reject the proposed changes and search for another solution"))),
-				      indentbox(0, 3,
+				      flowindentbox(0, 3,
 						fragf(_("give up and quit the program"))),
-				      indentbox(0, 3,
+				      flowindentbox(0, 3,
 						fragf(_("move to the next solution"))),
-				      indentbox(0, 3,
-						fragf(_("move to the previous solution"))))));
+				      flowindentbox(0, 3,
+						fragf(_("move to the previous solution"))),
+				      flowindentbox(0, 3,
+						fragf(_("adjust the state of the listed packages, where ACTION is one of:"))),
+				      flowindentbox(0, 4,
+						fragf(_("'+' to install packages"))),
+				      flowindentbox(0, 4,
+						fragf(_("'-' to remove packages"))),
+				      flowindentbox(0, 4,
+						    fragf(_("'_' to purge packages"))),
+				      flowindentbox(0, 4,
+						    fragf(_("'=' to hold packages"))),
+				      flowindentbox(0, 3,
+						    fragf(_("Adjustments will cause the current solution to be discarded and recalculated as necessary."))))));
 
   update_screen_width();
   out << f->layout(screen_width, screen_width);