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

[Daniel Burrows]

Author: dburrows
Date: Sun Apr 10 01:29:26 2005
New Revision: 2989

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver.h
Log:
Fix another infinite loop.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sun Apr 10 01:29:26 2005
@@ -2,6 +2,10 @@
 
 	* src/generic/aptitude_resolver.h:
 
+	  Don't spin forever looking for broken deps.
+
+	* src/generic/aptitude_resolver.h:
+
 	  Fix a silly segfault by initializing a dep as I meant to do in
 	  the first place.
 

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 01:29:26 2005
@@ -876,6 +876,10 @@
 
       while(the_dep.end() && !pkg.end())
 	{
+	  // Make sure we move at least one package forward!
+	  // Otherwise we just spin on the same package over and over,
+	  // since it's still broken..
+	  ++pkg;
 	  while(!pkg.end() && !(*apt_cache_file)[pkg].InstBroken())
 	    ++pkg;