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

[Daniel Burrows]

Author: dburrows
Date: Sun Apr 10 02:29:18 2005
New Revision: 2995

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/cmdline/cmdline_do_action.cc
Log:
More debugging output: summarize the final solutions.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sun Apr 10 02:29:18 2005
@@ -1,5 +1,9 @@
 2005-04-09  Daniel Burrows  <dburrows@debian.org>
 
+	* src/cmdline/cmdline_do_action.cc:
+
+	  Summarize the proposed solutions as debug output.
+
 	* src/generic/aptitude_resolver.h:
 
 	  Fix an extremely stupid bug (== vs !=) in

Modified: branches/aptitude-0.3/aptitude/src/cmdline/cmdline_do_action.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/cmdline_do_action.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/cmdline_do_action.cc	Sun Apr 10 02:29:18 2005
@@ -22,6 +22,8 @@
 #include <apt-pkg/error.h>
 #include <apt-pkg/progress.h>
 
+using namespace std;
+
 // TODO: add an option to obey sticky states even if it wasn't
 //      explicitly requested.
 //
@@ -180,9 +182,18 @@
 		      -40);
 
   // See what happens (for the debugging output).
-  resolver.find_next_solution(10000);
-  resolver.find_next_solution(10000);
-  resolver.find_next_solution(10000);
+
+  aptitude_resolver::solution s1=resolver.find_next_solution(10000);
+  aptitude_resolver::solution s2=resolver.find_next_solution(10000);
+  aptitude_resolver::solution s3=resolver.find_next_solution(10000);
+
+  cout << "Solution 1: " << endl;
+  s1.dump(cout);
+  cout << endl << endl << "Solution 2: " << endl;
+  s2.dump(cout);
+  cout << endl << endl << "Solution 3: " << endl;
+  s3.dump(cout);
+  cout << endl << endl;
 
   if(dist_upgrade ||
      (fix_broken && argc==1 && default_action==cmdline_install))