From cc04f4ce9eaaf0945775d5233806de7da5d21ff6 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 23 Apr 2012 22:03:23 +0200 Subject: provider is only a possible solution if the provides has the right version (or none as we have no versioned provides in debian) and not if the version of the provider matches --- apt-pkg/depcache.cc | 2 +- debian/changelog | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index daf7c8c4d..2656e9b42 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1164,7 +1164,7 @@ bool pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, pkgCache::VerIterator V = Prv.OwnerVer(); pkgCache::VerIterator Cand = PkgState[Prv.OwnerPkg()->ID].CandidateVerIter(*this); if (Cand.end() == true || V != Cand || - VS().CheckDep(Cand.VerStr(), Start->CompareOp, Start.TargetVer()) == false) + VS().CheckDep(Prv.ProvideVersion(), Start->CompareOp, Start.TargetVer()) == false) continue; verlist.insert(Cand); } diff --git a/debian/changelog b/debian/changelog index 558677345..34d6991b5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,11 +18,14 @@ apt (0.9.3) unstable; urgency=low - clearly separate 'positive' and 'negative' dependencies and their upgrade-resolution tries in MarkInstall and especially don't treat Conflicts differently compared to Breaks here + - provider is only a possible solution if the provides has the right + version (or none as we have no versioned provides in debian) and not + if the version of the provider matches * edsp/edspsystem.cc: - check with RealFileExists for scenario file as otherwise a directory like one provided with RootDir triggers the usage of EDSP - -- David Kalnischkies Mon, 23 Apr 2012 19:32:29 +0200 + -- David Kalnischkies Mon, 23 Apr 2012 22:02:58 +0200 apt (0.9.2) unstable; urgency=low -- cgit v1.2.3