* 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)

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index c36bac1a50e741c58f24f200deebf391fe410e5c..ba6960b23d48c9fe1e4a180a236b3994c0dc04b9 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.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 e639ed49feb5b06057e8eb1eb1f3659b7c34acf9..bab51656baf5d11f2c83698de15515f499865d90 100644 (file)
--- 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)
 
  --