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

Daniel Burrows dburrows at costa.debian.org
Thu Aug 18 00:48:05 UTC 2005


Author: dburrows
Date: Thu Aug 18 00:48:02 2005
New Revision: 3911

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/solution_screen.cc
Log:
Add hooks to allow the user to reject broken recommendations.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Thu Aug 18 00:48:02 2005
@@ -1,5 +1,10 @@
 2005-08-17  Daniel Burrows  <dburrows at debian.org>
 
+	* src/solutions_screen.cc:
+
+	  Use the new hardening/force-breaking stuff to allow users to
+	  manipulate solutions containing a broken recommendation.
+
 	* src/generic/problemresolver/problemresolver.h:
 
 	  Fix force_break() and unforce_break() to call reject_version()

Modified: branches/aptitude-0.3/aptitude/src/solution_screen.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/solution_screen.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/solution_screen.cc	Thu Aug 18 00:48:02 2005
@@ -547,34 +547,34 @@
 
   bool is_rejected()
   {
-    // STUB
+    return (*apt_cache_file)->resolver_is_hardened(d);
     return false;
   }
 
   bool is_mandatory()
   {
-    // STUB
+    return (*apt_cache_file)->resolver_is_forced_broken(d);
     return false;
   }
 
   void reject()
   {
-    // STUB
+    (*apt_cache_file)->resolver_harden_dep(d);
   }
 
   void unreject()
   {
-    // STUB
+    (*apt_cache_file)->resolver_unharden_dep(d);
   }
 
   void mandate()
   {
-    // STUB
+    (*apt_cache_file)->resolver_force_break_dep(d);
   }
 
   void unmandate()
   {
-    // STUB
+    (*apt_cache_file)->resolver_unforce_break_dep(d);
   }
 
   void paint(vs_tree *win, int y, bool hierarchical, const style &st)



More information about the Aptitude-svn-commit mailing list