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

[Daniel Burrows]

Author: dburrows
Date: Sat Sep 24 16:20:32 2005
New Revision: 4234

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:
Expose the approved_broken stuff from the 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:20:32 2005
@@ -2,6 +2,10 @@
 
 	* src/generic/resolver_manager.cc, src/generic/resolver_manager.h:
 
+	  Expose the approved_broken stuff from the manager.
+
+	* src/generic/resolver_manager.cc, src/generic/resolver_manager.h:
+
 	  Collect all the resolver manipulations into a common routine.
 
 	* src/generic/problemresolver/problemresolver.h:

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:20:32 2005
@@ -780,6 +780,24 @@
   return resolver->is_hardened(dep);
 }
 
+void resolver_manager::approve_broken_dep(const aptitude_resolver_dep &dep)
+{
+  resolver_manipulation(dep, &aptitude_resolver::approve_break);
+}
+
+void resolver_manager::unapprove_broken_dep(const aptitude_resolver_dep &dep)
+{
+  resolver_manipulation(dep, &aptitude_resolver::unapprove_break);
+}
+
+bool resolver_manager::is_approved_broken(const aptitude_resolver_dep &dep)
+{
+  threads::mutex::lock l(mutex);
+  assert(resolver != NULL);
+
+  return resolver->is_approved_broken(dep);
+}
+
 void resolver_manager::force_break_dep(const aptitude_resolver_dep &dep)
 {
   resolver_manipulation(dep, &aptitude_resolver::force_break);

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:20:32 2005
@@ -433,8 +433,6 @@
   /** \return \b true if the given version is mandatory. */
   bool is_mandatory(const aptitude_resolver_version &ver);
 
-
-
   /** Requires that resolver_exists is \b true.  Force the resolver to
    *  treat the given soft dependency as a hard dependency; as above,
    *  you can always cancel this instruction later.
@@ -447,6 +445,18 @@
   /** \return \b true if the given dep is hardened. */
   bool is_hardened(const aptitude_resolver_dep &dep);
 
+  /** Require the resolver to leave the given soft dependency broken
+   *  whenever possible.
+   */
+  void approve_broken_dep(const aptitude_resolver_dep &dep);
+
+  /** Cancel an approval set up with approve_broken(). */
+  void unapprove_broken_dep(const aptitude_resolver_dep &dep);
+
+  /** \return \b true if the given dependency is in the
+   *  approved-broken set.
+   */
+  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.