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

[Daniel Burrows]

Author: dburrows
Date: Fri Aug 19 20:14:07 2005
New Revision: 3925

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/problemresolver/problemresolver.h
Log:
Fix a bug that kept the user from seeing additional solutions if
he/she removed constraints after exhausting all solutions.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Fri Aug 19 20:14:07 2005
@@ -1,5 +1,10 @@
 2005-08-19  Daniel Burrows  <dburrows at debian.org>
 
+	* src/generic/problemresolver/problemresolver.h:
+
+	  Always check the deferred queue before checking whether we've
+	  run out of solutions.
+
 	* src/cmdline/cmdline_resolver.cc:
 
 	  Fix the messages displayed when accepting a version, and

Modified: branches/aptitude-0.3/aptitude/src/generic/problemresolver/problemresolver.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/problemresolver/problemresolver.h	(original)
+++ branches/aptitude-0.3/aptitude/src/generic/problemresolver/problemresolver.h	Fri Aug 19 20:14:07 2005
@@ -1654,14 +1654,20 @@
   /** \return \b true if no solutions have been examined yet.
    *  This implies that it is safe to modify package scores.
    */
-  bool fresh() const
+  bool fresh()
   {
+    if(deferred_dirty)
+      reexamine_deferred();
+
     return open.empty() && !finished;
   }
 
   /** \return \b true if the open queue is empty. */
-  bool exhausted() const
+  bool exhausted()
   {
+    if(deferred_dirty)
+      reexamine_deferred();
+
     return open.empty() && finished;
   }