Browse Source

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

David Kalnischkies 14 years ago
parent
commit
cc04f4ce9e
2 changed files with 5 additions and 2 deletions
  1. 1 1
      apt-pkg/depcache.cc
  2. 4 1
      debian/changelog

+ 1 - 1
apt-pkg/depcache.cc

@@ -1164,7 +1164,7 @@ bool pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst,
 	    pkgCache::VerIterator V = Prv.OwnerVer();
 	    pkgCache::VerIterator V = Prv.OwnerVer();
 	    pkgCache::VerIterator Cand = PkgState[Prv.OwnerPkg()->ID].CandidateVerIter(*this);
 	    pkgCache::VerIterator Cand = PkgState[Prv.OwnerPkg()->ID].CandidateVerIter(*this);
 	    if (Cand.end() == true || V != Cand ||
 	    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;
 	       continue;
 	    verlist.insert(Cand);
 	    verlist.insert(Cand);
 	 }
 	 }

+ 4 - 1
debian/changelog

@@ -18,11 +18,14 @@ apt (0.9.3) unstable; urgency=low
     - clearly separate 'positive' and 'negative' dependencies and
     - clearly separate 'positive' and 'negative' dependencies and
       their upgrade-resolution tries in MarkInstall and especially don't
       their upgrade-resolution tries in MarkInstall and especially don't
       treat Conflicts differently compared to Breaks here
       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:
   * edsp/edspsystem.cc:
     - check with RealFileExists for scenario file as otherwise a directory
     - check with RealFileExists for scenario file as otherwise a directory
       like one provided with RootDir triggers the usage of EDSP
       like one provided with RootDir triggers the usage of EDSP
 
 
- -- David Kalnischkies <kalnischkies@gmail.com>  Mon, 23 Apr 2012 19:32:29 +0200
+ -- David Kalnischkies <kalnischkies@gmail.com>  Mon, 23 Apr 2012 22:02:58 +0200
 
 
 apt (0.9.2) unstable; urgency=low
 apt (0.9.2) unstable; urgency=low