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

[Daniel Burrows]

Author: dburrows
Date: Sun Apr 10 02:01:45 2005
New Revision: 2991

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver.h
Log:
Squash 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 02:01:45 2005
@@ -1,5 +1,9 @@
 2005-04-09  Daniel Burrows  <dburrows@debian.org>
 
+	* src/generic/aptitude_resolver.h:
+
+	  Fix an infinite loop in the revdep_iterator.
+
 	* src/generic/aptitude_resolver.cc, src/generic/aptitude_resolver.h:
 
 	  Add spacing between the components of a depends list.

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 02:01:45 2005
@@ -322,7 +322,8 @@
   /** Advance to the next valid iterator. */
   void normalize()
   {
-    while(dep_lst.end())
+    // When we've run out of provides, give up..
+    while(dep_lst.end() && !prv_lst.end())
       {
 	if(!provides_open)
 	  {