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

[Daniel Burrows]

Author: dburrows
Date: Thu Aug 25 23:19:09 2005
New Revision: 3959

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver_universe.cc
Log:
Set provides_open to true before calling applicable().

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Thu Aug 25 23:19:09 2005
@@ -1,5 +1,12 @@
 2005-08-25  Daniel Burrows  <dburrows at debian.org>
 
+	* src/generic/aptitude_resolver_universe.cc:
+
+	  Set 'provides_open' to true before calling applicable(), so that
+	  versioned reverse dependencies on a provided package are
+	  correctly handled.  Also, remove a bunch of redundant
+	  is_interesting_dep() calls.
+
 	* src/generic/aptitude_resolver_universe.h:
 
 	  When comparing dependencies, ignore the attached provides

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 23:19:09 2005
@@ -65,22 +65,20 @@
 
 void aptitude_resolver_version::revdep_iterator::normalize()
 {
-  while(!dep_lst.end() &&
-	(!is_interesting_dep(dep_lst, cache) || !applicable()))
+  while(!dep_lst.end() && !applicable())
     ++dep_lst;
 
   if(dep_lst.end() && !provides_open)
     {
       assert(prv_lst.end());
       prv_lst=ver.ProvidesList();
+      provides_open=true;
       if(!prv_lst.end())
 	{
 	  dep_lst=prv_lst.ParentPkg().RevDependsList();
-	  while(!dep_lst.end() &&
-		(!is_interesting_dep(dep_lst, cache) || !applicable()))
+	  while(!dep_lst.end() && !applicable())
 	    ++dep_lst;
 	}
-      provides_open=true;
     }
 
   // When we've run out of provides, give up..
@@ -94,8 +92,7 @@
 	  assert(!prv_lst.ParentPkg().end());
 	  dep_lst=prv_lst.ParentPkg().RevDependsList();
 
-	  while(!dep_lst.end() &&
-		(!is_interesting_dep(dep_lst, cache) || !applicable()))
+	  while(!dep_lst.end() && !applicable())
 	    ++dep_lst;
 	}
     }