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

[Daniel Burrows]

Author: dburrows
Date: Sat Sep 24 16:42:13 2005
New Revision: 4237

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/resolver_manager.cc
   branches/aptitude-0.3/aptitude/src/generic/resolver_manager.h
Log:
Pull the forced_broken interface out of the resolver manager.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sat Sep 24 16:42:13 2005
@@ -1,5 +1,9 @@
 2005-09-24  Daniel Burrows  <dburrows at debian.org>
 
+	* src/generic/resolver_manager.cc, src/generic/resolver_manager.h:
+
+	  Rip the forced_broken stuff out of the resolver manager.
+
 	* src/solution_item.cc:
 
 	  Switch the solution_unresolved_item class to using the new

Modified: branches/aptitude-0.3/aptitude/src/generic/resolver_manager.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/resolver_manager.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/generic/resolver_manager.cc	Sat Sep 24 16:42:13 2005
@@ -798,24 +798,6 @@
   return resolver->is_approved_broken(dep);
 }
 
-void resolver_manager::force_break_dep(const aptitude_resolver_dep &dep)
-{
-  resolver_manipulation(dep, &aptitude_resolver::force_break);
-}
-
-void resolver_manager::unforce_break_dep(const aptitude_resolver_dep &dep)
-{
-  resolver_manipulation(dep, &aptitude_resolver::force_break);
-}
-
-bool resolver_manager::is_forced_broken(const aptitude_resolver_dep &dep)
-{
-  threads::mutex::lock l(mutex);
-  assert(resolver);
-
-  return resolver->is_forced_broken(dep);
-}
-
 bool resolver_manager::has_undo_items()
 {
   threads::mutex::lock l(mutex);

Modified: branches/aptitude-0.3/aptitude/src/generic/resolver_manager.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/resolver_manager.h	(original)
+++ branches/aptitude-0.3/aptitude/src/generic/resolver_manager.h	Sat Sep 24 16:42:13 2005
@@ -458,17 +458,6 @@
    */
   bool is_approved_broken(const aptitude_resolver_dep &dep);
 
-  /** Requires that resolver_exists is \b true.  Force the resolver to
-   *  leave the given soft dependency broken.
-   */
-  void force_break_dep(const aptitude_resolver_dep &dep);
-
-  /** Cancels a resolver_force_break_dep call. */
-  void unforce_break_dep(const aptitude_resolver_dep &dep);
-
-  /** \return \b true if the given dep is forced-broken. */
-  bool is_forced_broken(const aptitude_resolver_dep &dep);
-
 
 
   /** \return \b true if undo items exist in this resolver manager. */