summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArch Librarian <arch@canonical.com>2004-09-20 17:01:35 +0000
committerArch Librarian <arch@canonical.com>2004-09-20 17:01:35 +0000
commit03b9be809529a47e779cbc941a77bdd6c7e0f972 (patch)
tree9b1449b750aed89a6cff077ffdb8ac070fb78a31
parent0852eaef679d8ec0ba28aee346edc7ae6c0b1652 (diff)
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.
-rw-r--r--cmdline/apt-get.cc7
-rw-r--r--debian/changelog1
2 files changed, 6 insertions, 2 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index c4b4852f9..2dcee9ab4 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.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
@@ -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;
-
+
+ if (End == string::npos || End < Start)
+ End = Start + ScreenWidth;
+
Start = End + 1;
VersionsStart = VersionsEnd + 1;
} else {
diff --git a/debian/changelog b/debian/changelog
index 75bcd0649..d5ad0ef9d 100644
--- 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 never-ending loop with apt-get install -V. Closes: #192355.
-- Adam Heath <doogie@debian.org> Mon, 19 May 2003 11:53:49 -0500