Просмотр исходного кода

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

Arch Librarian лет назад: 22
Родитель
Сommit
57e2d8ee90
2 измененных файлов с 6 добавлено и 3 удалено
  1. 3 3
      cmdline/apt-get.cc
  2. 3 0
      debian/changelog

+ 3 - 3
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,

+ 3 - 0
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