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

[Daniel Burrows]

Author: dburrows
Date: Tue Apr 26 15:43:42 2005
New Revision: 3098

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/solution_fragment.cc
Log:
Tweak the formatting of the solution fragment.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Tue Apr 26 15:43:42 2005
@@ -1,5 +1,10 @@
 2005-04-26  Daniel Burrows  <dburrows@debian.org>
 
+	* src/solution_fragment.cc:
+
+	  Put parens around archives, don't uselessly translate format
+	  strings.
+
 	* src/vscreen/vs_table.cc:
 
 	  Fix a memory leak -- vs_tables didn't delete their children.

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	Tue Apr 26 15:43:42 2005
@@ -139,7 +139,7 @@
       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)
-	fragments.push_back(fragf(_("  %s [%s=%F]%n"),
+	fragments.push_back(fragf("  %s [%s (%F)]%n",
 				  i->ParentPkg().Name(),
 				  i->VerStr(),
 				  archives_fragment(*i)));
@@ -152,7 +152,7 @@
       fragments.push_back(fragf(_("%BKeep%b the following packages at their current version:%n")));
       for(vector<pkgCache::VerIterator>::const_iterator i=keep_packages.begin();
 	  i!=keep_packages.end(); ++i)
-	fragments.push_back(fragf(_("  %s [%s=%F]%n"),
+	fragments.push_back(fragf("  %s [%s (%F)]%n",
 				  i->ParentPkg().Name(),
 				  i->VerStr(),
 				  archives_fragment(*i)));
@@ -165,7 +165,7 @@
       fragments.push_back(fragf(_("%BUpgrade%b the following packages:%n")));
       for(vector<pkgCache::VerIterator>::const_iterator i=upgrade_packages.begin();
 	  i!=upgrade_packages.end(); ++i)
-	fragments.push_back(fragf(_("  %s [%s=%F -> %s=%F]%n"),
+	fragments.push_back(fragf("  %s [%s (%F) -> %s (%F)]%n",
 				  i->ParentPkg().Name(),
 				  i->ParentPkg().CurrentVer().VerStr(),
 				  archives_fragment(i->ParentPkg().CurrentVer()),
@@ -180,7 +180,7 @@
       fragments.push_back(fragf(_("%BDowngrade%b the following packages:%n")));
       for(vector<pkgCache::VerIterator>::const_iterator i=downgrade_packages.begin();
 	  i!=downgrade_packages.end(); ++i)
-	fragments.push_back(fragf(_("  %s [%s=%F -> %s=%F]%n"),
+	fragments.push_back(fragf("  %s [%s (%F) -> %s (%F)]%n",
 				  i->ParentPkg().Name(),
 				  i->ParentPkg().CurrentVer().VerStr(),
 				  archives_fragment(i->ParentPkg().CurrentVer()),