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

* apt-pkg/depcache.cc:
- when checking for new important deps, skip critical ones
(closes: #485943)

Michael Vogt лет назад: 18
Родитель
Сommit
4faff53f16
2 измененных файлов с 7 добавлено и 3 удалено
  1. 3 2
      apt-pkg/depcache.cc
  2. 4 1
      debian/changelog

+ 3 - 2
apt-pkg/depcache.cc

@@ -914,8 +914,9 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst,
 	     {
 	       //FIXME: deal better with or-groups(?)
 	       DepIterator LocalStart = D;
-	       
-	       if(IsImportantDep(D) && Start.TargetPkg() == D.TargetPkg())
+
+	       if(IsImportantDep(D) && !D.IsCritical() &&
+		  Start.TargetPkg() == D.TargetPkg())
 		 {
 		   if(!isPreviouslySatisfiedImportantDep)
 		     {

+ 4 - 1
debian/changelog

@@ -15,7 +15,10 @@ apt (0.7.15) UNRELEASED; urgency=low
     (thanks to Arnaud Ebalard, closes: #485965)
   * add doc/examples/apt-https-method-example.cof
     (thanks to Arnaud Ebalard, closes: #485964)
-
+  * apt-pkg/depcache.cc:
+    - when checking for new important deps, skip critical ones
+      (closes: #485943)
+  
  -- Christian Perrier <bubulle@debian.org>  Sat, 14 Jun 2008 07:39:06 +0200
 
 apt (0.7.14) unstable; urgency=low