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

[Daniel Burrows]

Author: dburrows
Date: Wed Aug 31 19:40:41 2005
New Revision: 4019

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver_universe.cc
Log:
Really exclude self-conflicts from the global broken list.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Wed Aug 31 19:40:41 2005
@@ -1,5 +1,11 @@
 2005-08-31  Daniel Burrows  <dburrows at debian.org>
 
+	* src/generic/aptitude_resolver_universe.cc:
+
+	  Fix the self-dependency check in broken_iterator::operator++;
+	  now the global list of broken packages in aptitude_universe
+	  properly excludes self-conflicts.  Fixes an assert failure.
+
 	* src/generic/problemresolver/dummy_universe.cc, src/generic/problemresolver/dummy_universe.h, src/generic/problemresolver/solution.h, src/generic/aptitude_resolver_universe.cc:
 
 	  Canonicalize some of the debugging output of the resolver to

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	Wed Aug 31 19:40:41 2005
@@ -488,7 +488,7 @@
       while(!prv.end())
 	{
 	  // Ignore indirect self-conflicts.
-	  if(prv.OwnerPkg() != the_dep.TargetPkg())
+	  if(prv.OwnerPkg() != the_dep.ParentPkg())
 	    {
 	      // First, is the providing version going to be
 	      // installed?