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

Daniel Burrows dburrows at costa.debian.org
Wed Aug 31 20:03:38 UTC 2005


Author: dburrows
Date: Wed Aug 31 20:03:35 2005
New Revision: 4021

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver_universe.cc
Log:
Don't ignore packages with only broken soft deps when building the 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 20:03:35 2005
@@ -1,5 +1,11 @@
 2005-08-31  Daniel Burrows  <dburrows at debian.org>
 
+	* src/generic/aptitude_resolver_universe.cc:
+
+	  Don't skip packages that aren't InstBroken when searching for
+	  broken packages; fixes the broken-list anomaly that recently
+	  turned up.
+
 	* tests/test_apt_universe.cc, tests/data/*:
 
 	  Add an apt_universe test for the consistency of the broken list,

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 20:03:35 2005
@@ -429,8 +429,6 @@
       // Otherwise we just spin on the same package over and over,
       // since it's still broken..
       ++pkg;
-      while(!pkg.end() && !(*cache)[pkg].InstBroken())
-	++pkg;
 
       if(!pkg.end())
 	{



More information about the Aptitude-svn-commit mailing list