summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArch Librarian <arch@canonical.com>2004-09-20 17:05:09 +0000
committerArch Librarian <arch@canonical.com>2004-09-20 17:05:09 +0000
commitd20333af6b2091df46e78d3f0a34ae8a3e081584 (patch)
tree111000a7527c74e918296da464475994d072f885
parentf2120f3d61c716d5a2489a450ef41db7b49e8d51 (diff)
* Fix apt-get's suggests/recommends printing, which was...
Author: mdz Date: 2004-01-26 18:14:36 GMT * Fix apt-get's suggests/recommends printing, which was skipping every other dependency due to both using GlobOr and incrementing the DepIterator (Closes: #229722)
-rw-r--r--cmdline/apt-get.cc8
-rw-r--r--debian/changelog3
2 files changed, 7 insertions, 4 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index c36bac1a5..ba6960b23 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.153 2004/01/26 18:10:57 mdz Exp $
+// $Id: apt-get.cc,v 1.154 2004/01/26 18:14:36 mdz Exp $
/* ######################################################################
apt-get - Cover for dpkg
@@ -270,7 +270,7 @@ void ShowBroken(ostream &out,CacheFile &Cache,bool Now)
// Compute a single dependency element (glob or)
pkgCache::DepIterator Start;
pkgCache::DepIterator End;
- D.GlobOr(Start,End);
+ D.GlobOr(Start,End); // advances D
if (Cache->IsImportantDep(End) == false)
continue;
@@ -1533,11 +1533,11 @@ bool DoInstall(CommandLine &CmdL)
for (pkgCache::VerIterator V = I.VersionList(); V.end() == false; V++)
{
- for (pkgCache::DepIterator D = V.DependsList(); D.end() == false; D++)
+ for (pkgCache::DepIterator D = V.DependsList(); D.end() == false; )
{
pkgCache::DepIterator Start;
pkgCache::DepIterator End;
- D.GlobOr(Start,End);
+ D.GlobOr(Start,End); // advances D
/*
* If this is a virtual package, we need to check the list of
diff --git a/debian/changelog b/debian/changelog
index e639ed49f..bab51656b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ apt (0.5.22) unstable; urgency=low
* Updated French translation of man pages from Philippe Batailler
<philippe.batailler@free.fr> (Closes: #203119)
* Initialize StatusFile in debSystem (Closes: #229791)
+ * Fix apt-get's suggests/recommends printing, which was skipping every
+ other dependency due to both using GlobOr and incrementing the DepIterator
+ (Closes: #229722)
--