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

Daniel Burrows dburrows@costa.debian.org
Sat, 23 Apr 2005 02:34:29 +0000


Author: dburrows
Date: Sat Apr 23 02:34:26 2005
New Revision: 3067

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/aptcache.cc
Log:
Fix solutions_exhausted().

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sat Apr 23 02:34:26 2005
@@ -1,5 +1,9 @@
 2005-04-22  Daniel Burrows  <dburrows@debian.org>
 
+	* src/generic/aptcache.cc:
+
+	  Fix a reversed comparison in solutions_exhausted.
+
 	* src/generic/problemresolver/problemresolver.h:
 
 	  For more correctness, always throw NoMoreSolutions when we're

Modified: branches/aptitude-0.3/aptitude/src/generic/aptcache.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/aptcache.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/generic/aptcache.cc	Sat Apr 23 02:34:26 2005
@@ -1385,7 +1385,7 @@
   if(!resolver_exists())
     return true;
   else
-    return selected_solution == generated_solution_count()+1 &&
+    return selected_solution+1 == generated_solution_count() &&
       solution_generation_complete();
 }