summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArch Librarian <arch@canonical.com>2004-09-20 17:01:00 +0000
committerArch Librarian <arch@canonical.com>2004-09-20 17:01:00 +0000
commit4968036c93552ff78c1f857a91c685f0f3bcb794 (patch)
tree0491b6a83223de7fb091fd2068a0eb5151baf2fa
parent519c55915528007c1baaf7538b46212f4a42a805 (diff)
downloadapt-4968036c93552ff78c1f857a91c685f0f3bcb794.tar.gz
Remove trailing lines on package lists.
Author: doogie Date: 2003-02-12 16:14:08 GMT Remove trailing lines on package lists.
-rw-r--r--cmdline/apt-get.cc10
-rw-r--r--debian/changelog1
2 files changed, 10 insertions, 1 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 6ed1022fa..05d408f42 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: apt-get.cc,v 1.125 2003/02/02 03:30:53 tausq Exp $
+// $Id: apt-get.cc,v 1.126 2003/02/12 16:14:08 doogie Exp $
/* ######################################################################
apt-get - Cover for dpkg
@@ -154,6 +154,14 @@ bool ShowList(ostream &out,string Title,string List)
{
if (List.empty() == true)
return true;
+ // trim trailing space
+ int NonSpace = List.find_last_not_of(' ');
+ if (NonSpace != -1)
+ {
+ List = List.erase(NonSpace + 1);
+ if (List.empty() == true)
+ return true;
+ }
// Acount for the leading space
int ScreenWidth = ::ScreenWidth - 3;
diff --git a/debian/changelog b/debian/changelog
index 1b34e8f35..b477fdf75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -95,6 +95,7 @@ apt (0.5.4.9) unstable; urgency=low
* Use doc-base, instead of dhelp directly. Closes: #110389
* Change http message 'Waiting for file' to 'Waiting for headers'.
Closes: #178537
+ * Remove trailing lines on package lists in apt-get. Closes: #178736.
-- Adam Heath <doogie@debian.org> Sun, 02 Feb 2003 02:54:45 -0600