Fix never-ending loop in apt-get install -V.

Author: doogie
Date: 2003-05-19 17:30:12 GMT
Fix never-ending loop in apt-get install -V.

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index c4b4852f90b8682c94dee286189050670cf40e47..2dcee9ab4c2ca2bc9493966c85179419cffbb51e 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: apt-get.cc,v 1.129 2003/04/27 05:59:33 doogie Exp $
+// $Id: apt-get.cc,v 1.130 2003/05/19 17:30:12 doogie Exp $

 /* ######################################################################
    
    apt-get - Cover for dpkg
 /* ######################################################################
    
    apt-get - Cover for dpkg


@@ -182,7 +182,10 @@ bool ShowList(ostream &out,string Title,string List,string VersionsList)
          out << "   " << string(List,Start,End - Start) << " (" << 
             string(VersionsList,VersionsStart,VersionsEnd - VersionsStart) << 
             ")" << endl;
          out << "   " << string(List,Start,End - Start) << " (" << 
             string(VersionsList,VersionsStart,VersionsEnd - VersionsStart) << 
             ")" << endl;

-         
+
+        if (End == string::npos || End < Start)
+           End = Start + ScreenWidth;
+

          Start = End + 1;
          VersionsStart = VersionsEnd + 1;
       } else {
          Start = End + 1;
          VersionsStart = VersionsEnd + 1;
       } else {

diff --git a/debian/changelog b/debian/changelog
index 75bcd064969fab8d1b9eb9e3b32b0aaed045ffc8..d5ad0ef9dbe5d9c0a7e8e8df2e3f3fb389c55a13 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ apt (0.5.5.1) unstable; urgency=low
   * Fix api breakage that broke apt-ftparchive and apt-cache dumpavail, by
     backing out change that incorretly attempted to handle Package sections
     larger than 32k.  Closes: #192373
   * Fix api breakage that broke apt-ftparchive and apt-cache dumpavail, by
     backing out change that incorretly attempted to handle Package sections
     larger than 32k.  Closes: #192373

+  * Fix never-ending loop with apt-get install -V.  Closes: #192355.

 
  -- Adam Heath <doogie@debian.org>  Mon, 19 May 2003 11:53:49 -0500
 
 
  -- Adam Heath <doogie@debian.org>  Mon, 19 May 2003 11:53:49 -0500