* Patch from Otavio Salvador to avoid listing suggests/...

Author: mdz
Date: 2003-08-08 23:45:00 GMT
* Patch from Otavio Salvador to avoid listing suggests/recommends for
packages which are selected for installation at the same time as the
package which suggests/recommends them (Closes: #200102)

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 0d32b9b39a7eda198b5e937793dd31346d455bc7..6aaa4e8c2adae0d17c36d5618d05dc5c2192de64 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.134 2003/08/07 20:51:50 mdz Exp $
+// $Id: apt-get.cc,v 1.135 2003/08/08 23:45:00 mdz Exp $
 /* ######################################################################
    
    apt-get - Cover for dpkg
@@ -1535,7 +1535,7 @@ bool DoInstall(CommandLine &CmdL)
                          installed already */
 
                       string target = string(Start.TargetPkg().Name()) + " ";
-                      if ((*Start.TargetPkg()).SelectedState == pkgCache::State::Install)
+                      if ((*Start.TargetPkg()).SelectedState == pkgCache::State::Install || Cache[Start.TargetPkg()].Install())
                         break;
                       /* Does another package suggest it as well?  If so,
                          don't print it twice */
@@ -1551,7 +1551,7 @@ bool DoInstall(CommandLine &CmdL)
                          installed already */
 
                       string target = string(Start.TargetPkg().Name()) + " ";
-                      if ((*Start.TargetPkg()).SelectedState == pkgCache::State::Install)
+                      if ((*Start.TargetPkg()).SelectedState == pkgCache::State::Install || Cache[Start.TargetPkg()].Install())
                         break;
                       
                       /* Does another package recommend it as well?  If so,

diff --git a/debian/changelog b/debian/changelog
index 59042ccaf188d0a3184507549aad6c80f2ca9060..dffa1171c553954f014a060fa53a51c687a8ae3a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,9 @@ apt (0.5.9) unstable; urgency=low
   * Avoid segfault if a package name is specified which consists
     entirely of characters which look like end tags ('+', '-')
     (Closes: #200425)
+  * Patch from Otavio Salvador to avoid listing suggests/recommends for
+    packages which are selected for installation at the same time as the
+    package which suggests/recommends them (Closes: #200102)
 
  -- Matt Zimmerman <mdz@debian.org>  Fri,  8 Aug 2003 19:31:25 -0400