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

[Daniel Burrows]

Author: dburrows
Date: Sat Apr 23 03:00:20 2005
New Revision: 3069

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/solution_fragment.cc
Log:
Display the score of each solution at the bottom of it.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sat Apr 23 03:00:20 2005
@@ -1,5 +1,9 @@
 2005-04-22  Daniel Burrows  <dburrows@debian.org>
 
+	* src/solution_fragment.cc:
+
+	  Display the score of the solution.
+
 	* src/generic/aptcache.cc:
 
 	  Tweak the default scores: be slightly less hostile to changing

Modified: branches/aptitude-0.3/aptitude/src/solution_fragment.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/solution_fragment.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/solution_fragment.cc	Sat Apr 23 03:00:20 2005
@@ -123,24 +123,19 @@
     }
 
   vector<fragment *> fragments;
-  bool first=true;
 
   if(!remove_packages.empty())
     {
-      first=false;
       fragments.push_back(fragf(_("%BRemove%b the following packages:%n")));
       for(vector<pkgCache::PkgIterator>::const_iterator i=remove_packages.begin();
 	  i!=remove_packages.end(); ++i)
 	fragments.push_back(fragf("  %s%n", i->Name()));
+
+      fragments.push_back(newline_fragment());
     }
 
   if(!install_packages.empty())
     {
-      if(!first)
-	fragments.push_back(newline_fragment());
-      else
-	first=false;
-
       fragments.push_back(fragf(_("%BInstall%b the following packages:%n")));
       for(vector<pkgCache::VerIterator>::const_iterator i=install_packages.begin();
 	  i!=install_packages.end(); ++i)
@@ -148,15 +143,12 @@
 				  i->ParentPkg().Name(),
 				  i->VerStr(),
 				  archives_fragment(*i)));
+
+      fragments.push_back(newline_fragment());
     }
 
   if(!keep_packages.empty())
     {
-      if(!first)
-	fragments.push_back(newline_fragment());
-      else
-	first=false;
-
       fragments.push_back(fragf(_("%BKeep%b the following packages at their current version:")));
       for(vector<pkgCache::VerIterator>::const_iterator i=keep_packages.begin();
 	  i!=keep_packages.end(); ++i)
@@ -164,15 +156,12 @@
 				  i->ParentPkg().Name(),
 				  i->VerStr(),
 				  archives_fragment(*i)));
+
+      fragments.push_back(newline_fragment());
     }
 
   if(!upgrade_packages.empty())
     {
-      if(!first)
-	fragments.push_back(newline_fragment());
-      else
-	first=false;
-
       fragments.push_back(fragf(_("%BUpgrade%b the following packages:")));
       for(vector<pkgCache::VerIterator>::const_iterator i=upgrade_packages.begin();
 	  i!=upgrade_packages.end(); ++i)
@@ -182,15 +171,12 @@
 				  archives_fragment(i->ParentPkg().CurrentVer()),
 				  i->VerStr(),
 				  archives_fragment(*i)));
+
+      fragments.push_back(newline_fragment());
     }
 
   if(!downgrade_packages.empty())
     {
-      if(!first)
-	fragments.push_back(newline_fragment());
-      else
-	first=false;
-
       fragments.push_back(fragf(_("%BDowngrade%b the following packages:")));
       for(vector<pkgCache::VerIterator>::const_iterator i=downgrade_packages.begin();
 	  i!=downgrade_packages.end(); ++i)
@@ -200,7 +186,13 @@
 				  archives_fragment(i->ParentPkg().CurrentVer()),
 				  i->VerStr(),
 				  archives_fragment(*i)));
+
+      fragments.push_back(newline_fragment());
     }
 
+  char buf[512];
+  snprintf(buf, 512, _("Score is %d"), sol.get_score());
+  fragments.push_back(fragf("%s", buf));
+
   return flowbox(sequence_fragment(fragments));
 }