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

[Daniel Burrows]

Author: dburrows
Date: Sat Sep 24 16:47:14 2005
New Revision: 4238

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/problemresolver/problemresolver.h
Log:
Remove the forced_broken interface from the resolver.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sat Sep 24 16:47:14 2005
@@ -1,5 +1,11 @@
 2005-09-24  Daniel Burrows  <dburrows at debian.org>
 
+	* src/generic/problemresolver/problemresolver.h:
+
+	  Remove the forced_broken interface from the resolver itself.
+	  Switch a call to unforce_break that I missed earlier to invoke
+	  unapprove_break instead.
+
 	* src/generic/resolver_manager.cc, src/generic/resolver_manager.h:
 
 	  Rip the forced_broken stuff out of the resolver manager.

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	Sat Sep 24 16:47:14 2005
@@ -2171,7 +2171,7 @@
 	if(undo != NULL)
 	  undo->add_item(new undo_resolver_manipulation<PackageUniverse, dep>(this, d, &generic_problem_resolver<PackageUniverse>::unharden));
 
-	unforce_break(d, undo);
+	unapprove_break(d, undo);
       }
   }
 
@@ -2228,67 +2228,6 @@
       }
   }
 
-  /** Query whether the given dependency is forced to be broken. */
-  bool is_forced_broken(const dep &d) const
-  {
-    if(user_hardened.find(d) != user_hardened.end())
-      return false;
-
-    for(typename dep::solver_iterator si = d.solvers_begin();
-	!si.end(); ++si)
-      if(!is_rejected(*si))
-	return false;
-
-    version source = d.get_source();
-    for(typename package::version_iterator
-	  vi = source.get_package().versions_begin(); !vi.end(); ++vi)
-      if(*vi != source && !is_rejected(*vi))
-	return false;
-
-    return true;
-  }
-
-  /** Force the given soft dependency to be broken.
-   *
-   *  \param d a soft dependency.
-   */
-  void force_break(const dep &d, undo_group *undo = NULL)
-  {
-    assert(d.is_soft());
-
-    for(typename dep::solver_iterator si = d.solvers_begin();
-	!si.end(); ++si)
-      reject_version(*si, undo);
-
-    version source = d.get_source();
-
-    for(typename package::version_iterator
-	  vi = source.get_package().versions_begin(); !vi.end(); ++vi)
-      if(*vi != source)
-	reject_version(*vi, undo);
-
-    unharden(d, undo);
-  }
-
-  /** The given soft dependency must be forced-broken; allow it to be
-   *  resolved in any way.
-   */
-  void unforce_break(const dep &d, undo_group *undo = NULL)
-  {
-    assert(d.is_soft());
-
-    for(typename dep::solver_iterator si = d.solvers_begin();
-	!si.end(); ++si)
-      unreject_version(*si, undo);
-
-    version source = d.get_source();
-
-    for(typename package::version_iterator
-	  vi = source.get_package().versions_begin(); !vi.end(); ++vi)
-      if(*vi != source)
-	unreject_version(*vi, undo);
-  }
-
   /** Cancel any find_next_solution call that is executing in the
    *  background.  If no such call is executing, then the next call
    *  will immediately be cancelled.