* apt-pkg/depcache.cc:

  - when checking for new important deps, skip critical ones
    (closes: #485943)

diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index d1bea4cf6786d186f7008bfb784ac8c5c2c28cb6..d8b4dc6d2802801e336c9d09406f524ff52b4010 100644 (file)
--- a/apt-pkg/depcache.cc
+++ b/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;
             {
               //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)
                     {
                 {
                   if(!isPreviouslySatisfiedImportantDep)
                     {

diff --git a/debian/changelog b/debian/changelog
index 3048752010c4238835fc3242c0c86b45593c650f..8bc57763badfd94598c08e01ffdd4dc543057375 100644 (file)
--- a/debian/changelog
+++ b/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)
     (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
  -- Christian Perrier <bubulle@debian.org>  Sat, 14 Jun 2008 07:39:06 +0200
 
 apt (0.7.14) unstable; urgency=low