[Aptitude-svn-commit] r4233 - branches/aptitude-0.3/aptitude/src/generic

[Daniel Burrows]

Author: dburrows
Date: Sat Sep 24 16:13:06 2005
New Revision: 4233

Modified:
   branches/aptitude-0.3/aptitude/src/generic/resolver_manager.cc
Log:
More duplicated code removal

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:13:06 2005
@@ -782,43 +782,12 @@
 
 void resolver_manager::force_break_dep(const aptitude_resolver_dep &dep)
 {
-  threads::mutex::lock l(mutex);
-  background_suspender bs(*this);
-
-  assert(resolver);
-
-  undo_group *undo = new undo_group;
-  resolver->force_break(dep, undo);
-  if(undo->empty())
-    delete undo;
-  else
-    undos->add_item(undo);
-
-  l.release();
-  bs.unsuspend();
-  state_changed();
+  resolver_manipulation(dep, &aptitude_resolver::force_break);
 }
 
 void resolver_manager::unforce_break_dep(const aptitude_resolver_dep &dep)
 {
-  threads::mutex::lock l(mutex);
-  background_suspender bs(*this);
-
-  assert(resolver);
-
-  undo_group *undo = new undo_group;
-  resolver->unforce_break(dep, undo);
-  if(undo->empty())
-    delete undo;
-  else
-    undos->add_item(undo);
-
-  out_of_solutions.take();
-  out_of_solutions.put(false);
-
-  l.release();
-  bs.unsuspend();
-  state_changed();
+  resolver_manipulation(dep, &aptitude_resolver::force_break);
 }
 
 bool resolver_manager::is_forced_broken(const aptitude_resolver_dep &dep)