* apt-pkg/algorithms.cc:

  - when encountering a or-group in pkgProblemResolver::Resolver(), check
    if it IsCritical(), otherwise we may do checking on weak-depends and
    confuse the system badly

diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index 0d486d10254b2f84caa1728959d7165a3594fa6e..e1b9406e2341f9d85d98793b055ecf055ab6363d 100644 (file)
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -841,7 +841,12 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
               OldEnd = LEnd;
            }
            else
+            {
               Start++;
+              // We only worry about critical deps.
+              if (Start.IsCritical() != true)
+                  continue;
+            }
 
            // Dep is ok
            if ((Cache[End] & pkgDepCache::DepGInstall) == pkgDepCache::DepGInstall)

diff --git a/debian/changelog b/debian/changelog
index bbeecdeecbf4bb6a301c5fcf9f4481586b432057..7893f2599e97ac581bf36c8aa4336bf2c58605a3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ apt (0.6.46.5) UNRELEASED; urgency=low
     - use clog for all debugging
     - only increase the score of installed applications if they 
       are not obsolete 
+    - fix resolver bug on removal triggered by weak-dependencies 
+      with or-groups
   * methods/http.cc:
     - send apt version in User-Agent
   * apt-pkg/deb/debrecords.cc: