Remove trailing lines on package lists.

Author: doogie
Date: 2003-02-12 16:14:08 GMT
Remove trailing lines on package lists.

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 6ed1022fac2275ddabb07ceeae6cba2f65118fae..05d408f425bba23b24dc7671b29557dc1f3ea213 100644 (file)
--- 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 1b34e8f35eb167207aedc98800a25337d6262f56..b477fdf75307a3c717d01ce8ff211ce6ae0f8af3 100644 (file)
--- 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