merge the AutoInstOk patch from debian-experimental

[apt.git] / apt-pkg / algorithms.cc

diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index db370a0441b29185de453c86e558bdb5600d9ae0..2ad0643199fac6f034a3f554a9c97012a4d57791 100644 (file)
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -985,7 +985,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
                        // Consider other options
                        if (InOr == false)
                        {
-                          if (Cache.IsAutoInstallOk(I) == true)
+                          if (Cache.AutoInstOk(I, Cache[I].CandidateVerIter(Cache),Start) == true)
                           {
                              if (Debug == true)
                                 clog << "  Removing " << I.Name() << " rather than change " << Start.TargetPkg().Name() << endl;