[Aptitude-devel] r3006 - in branches/aptitude-0.3/aptitude: . src/generic

[Daniel Burrows]

Author: dburrows
Date: Sun Apr 10 13:37:55 2005
New Revision: 3006

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver.h
Log:
Fix the error that caused non-solving versions to show up as solving Conflicts.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sun Apr 10 13:37:55 2005
@@ -2,6 +2,12 @@
 
 	* src/generic/aptitude_resolver.h:
 
+	  Always normalize solver_iterators.  This should fix the problem
+	  where Conflicts would include the first version of the
+	  conflicted package as a solver.
+
+	* src/generic/aptitude_resolver.h:
+
 	  Only iterate over critical revdeps (I was iterating over *all*
 	  revdeps, which is what caused all the weirdness before).
 

Modified: branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver.h	(original)
+++ branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver.h	Sun Apr 10 13:37:55 2005
@@ -583,8 +583,9 @@
 
 	ver_lst=const_cast<pkgCache::DepIterator &>(start).TargetPkg().VersionList();
 	prv_lst=const_cast<pkgCache::DepIterator &>(start).TargetPkg().ProvidesList();
-	normalize();
       }
+
+    normalize();
   }
 
   /** Initialize a Conflicts solution iterator. */
@@ -602,6 +603,8 @@
 	else
 	  ver_lst=const_cast<pkgCache::PrvIterator &>(p).OwnerPkg().VersionList();
       }
+
+    normalize();
   }
 
   solver_iterator()