diff options
Diffstat (limited to 'apt-pkg/algorithms.cc')
| -rw-r--r-- | apt-pkg/algorithms.cc | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index bd9a9df62..3c8711b74 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -987,24 +987,6 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) pkgCache::VerIterator Ver(Cache,*V); pkgCache::PkgIterator Pkg = Ver.ParentPkg(); - /* Ignore a target that is not a candidate - This can happen if: - installed package provides video-6 - candidate provides video-8 - now if a package Start breaks/conflicts video-6 - Start.AllTargets() will return the now-installed - versions even though these are not candidates - we can ignore them - */ - if (Cache[Pkg].CandidateVerIter(Cache) != Ver) - { - if (Debug) - clog << " Version " << Ver.VerStr() << " for " - << Pkg.Name() << " is not a candidate, ignoring" - << endl; - continue; - } - if (Debug == true) clog << " Considering " << Pkg.FullName(false) << ' ' << (int)Scores[Pkg->ID] << " as a solution to " << I.FullName(false) << ' ' << (int)Scores[I->ID] << endl; @@ -1098,7 +1080,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) if (Start->Type == pkgCache::Dep::DpkgBreaks) { - // first, try upgrading the package, if that + // first, try upgradring the package, if that // does not help, the breaks goes onto the // kill list // FIXME: use DoUpgrade(Pkg) instead? @@ -1123,7 +1105,6 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) LEnd++; if (Start->Type != pkgCache::Dep::Conflicts && - Start->Type != pkgCache::Dep::DpkgBreaks && Start->Type != pkgCache::Dep::Obsoletes) break; } |