[Aptitude-svn-commit] r3951 - in branches/aptitude-0.3/aptitude: . src/generic

[Daniel Burrows]

Author: dburrows
Date: Thu Aug 25 19:41:58 2005
New Revision: 3951

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver_universe.cc
Log:
Follow Provides in solved_by().

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Thu Aug 25 19:41:58 2005
@@ -1,3 +1,9 @@
+2005-08-25  Daniel Burrows  <dburrows at debian.org>
+
+	* src/generic/aptitude_resolver_universe.cc:
+
+	  Follow Provides in solved_by().
+
 2005-08-24  Daniel Burrows  <dburrows at debian.org>
 
 	* src/generic/aptitude_resolver_universe.cc:

Modified: branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver_universe.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver_universe.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver_universe.cc	Thu Aug 25 19:41:58 2005
@@ -275,6 +275,13 @@
 						      d.TargetVer())))
 	    return true;
 
+	  // Check for a resolution via Provides.
+	  if(!d.TargetVer())
+	    for(pkgCache::PrvIterator p2 = v.get_ver().ProvidesList();
+		!p2.end(); ++p2)
+	      if(const_cast<pkgCache::PrvIterator &>(p2).ParentPkg() == d.TargetPkg())
+		return true;
+
 	  if((d->CompareOp & pkgCache::Dep::Or) != 0)
 	    ++d;
 	  else