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

[Daniel Burrows]

Author: dburrows
Date: Thu Apr 28 16:12:06 2005
New Revision: 3175

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/cmdline/cmdline_resolver.cc
Log:
Don't crash when we try to print a solution.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Thu Apr 28 16:12:06 2005
@@ -1,5 +1,10 @@
 2005-04-28  Daniel Burrows  <dburrows@debian.org>
 
+	* src/cmdline/cmdline_resolver.cc:
+
+	  Doh, C++ varargs have to be explicitly terminated; do that
+	  instead of crashing.
+
 	* src/main.cc:
 
 	  Add debugging catches to trap unhandled exceptions.

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	Thu Apr 28 16:12:06 2005
@@ -128,7 +128,8 @@
 		  {
 		    fragment *f=sequence_fragment(flowbox(text_fragment(_("The following actions will resolve these dependencies:"))),
 						  newline_fragment(),
-						  solution_fragment(sol));
+						  solution_fragment(sol),
+						  NULL);
 
 		    update_screen_width();