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

Daniel Burrows dburrows at costa.debian.org
Wed Aug 17 23:55:27 UTC 2005


Author: dburrows
Date: Wed Aug 17 23:55:24 2005
New Revision: 3910

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/problemresolver/problemresolver.h
Log:
Fix a silly typo/compile error.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Wed Aug 17 23:55:24 2005
@@ -1,5 +1,11 @@
 2005-08-17  Daniel Burrows  <dburrows at debian.org>
 
+	* src/generic/problemresolver/problemresolver.h:
+
+	  Fix force_break() and unforce_break() to call reject_version()
+	  and unreject_version() rather than reject() and unreject().
+	  Fixes compilation.
+
 	* src/generic/problemresolver/problemresolver.h, src/generic/aptcache.cc, src/generic/aptcache.h:
 
 	  Add support for "hardening" soft dependencies; basically this

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	Wed Aug 17 23:55:24 2005
@@ -1780,7 +1780,7 @@
 
     for(typename dep::solver_iterator si = d.solvers_begin();
 	!si.end(); ++si)
-      reject(*si);
+      reject_version(*si);
   }
 
   /** The given soft dependency must be forced-broken; allow it to be
@@ -1792,7 +1792,7 @@
 
     for(typename dep::solver_iterator si = d.solvers_begin();
 	!si.end(); ++si)
-      unreject(*si);
+      unreject_version(*si);
   }
 
   /** Try to find the "next" solution: remove partial solutions from



More information about the Aptitude-svn-commit mailing list