[Aptitude-devel] r3095 - in branches/aptitude-0.3/aptitude: . src
Daniel Burrows
dburrows@costa.debian.org
Tue, 26 Apr 2005 15:01:42 +0000
Author: dburrows
Date: Tue Apr 26 15:01:39 2005
New Revision: 3095
Modified:
branches/aptitude-0.3/aptitude/ChangeLog
branches/aptitude-0.3/aptitude/src/solution_fragment.cc
Log:
Fix missing newlines when generating a 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:01:39 2005
@@ -1,5 +1,9 @@
2005-04-26 Daniel Burrows <dburrows@debian.org>
+ * src/solution_fragment.cc:
+
+ Fix some missing newlines in the solution fragment formatting.
+
* src/cmdline/cmdline_show.cc, src/vscreen/fragment.cc, src/vscreen/fragment.h, src/vscreen/vs_layout_item.cc, src/vscreen/vs_text_layout.cc:
Make the text layout algorithm also take indentation into
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:01:39 2005
@@ -149,7 +149,7 @@
if(!keep_packages.empty())
{
- fragments.push_back(fragf(_("%BKeep%b the following packages at their current version:")));
+ 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"),
@@ -162,7 +162,7 @@
if(!upgrade_packages.empty())
{
- fragments.push_back(fragf(_("%BUpgrade%b the following packages:")));
+ 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"),
@@ -177,7 +177,7 @@
if(!downgrade_packages.empty())
{
- fragments.push_back(fragf(_("%BDowngrade%b the following packages:")));
+ 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"),