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

[Daniel Burrows]

Author: dburrows
Date: Thu Aug 18 00:51:33 2005
New Revision: 3913

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/problemresolver/problemresolver.h
Log:
Check for unresolved hardened deps both when enqueuing solutions and when dequeueuing them.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Thu Aug 18 00:51:33 2005
@@ -2,6 +2,11 @@
 
 	* src/generic/problemresolver/problemresolver.h:
 
+	  Check for unresolved hardened deps both when enqueuing solutions
+	  and when dequeuing them.
+
+	* src/generic/problemresolver/problemresolver.h:
+
 	  Fix breaks_hardened() to actually work.
 
 	* src/solutions_screen.cc:

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	Thu Aug 18 00:51:33 2005
@@ -1022,7 +1022,7 @@
    *  user_rejected by testing whether the intersection of the
    *  solution domain and the rejected set is nonempty.
    */
-  bool is_rejected(const solution &s) const
+  bool contains_rejected(const solution &s) const
   {
     typename std::set<version>::const_iterator ur_iter
       = user_rejected.begin();
@@ -1069,7 +1069,7 @@
   /** \return \b true if the given solution should be deferred. */
   bool should_defer(const solution &s) const
   {
-    return is_rejected(s) || breaks_hardened(s);
+    return contains_rejected(s) || breaks_hardened(s);
   }
 
   /** Place any solutions that were deferred and are no longer
@@ -1856,7 +1856,7 @@
 	    continue;
 	  }
 
-	if(is_rejected(s))
+	if(should_defer(s))
 	  {
 	    if(debug)
 	      {