[Aptitude-devel] r3001 - in branches/aptitude-0.3/aptitude: . src/cmdline

Daniel Burrows dburrows@costa.debian.org
Sun, 10 Apr 2005 03:34:53 +0000


Author: dburrows
Date: Sun Apr 10 03:34:42 2005
New Revision: 3001

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/cmdline/cmdline_do_action.cc
Log:
Fix the penalties/rewards for broken packages and long solns.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sun Apr 10 03:34:42 2005
@@ -1,5 +1,9 @@
 2005-04-09  Daniel Burrows  <dburrows@debian.org>
 
+	* src/cmdline/cmdline_do_action.cc:
+
+	  Penalize, don't reward, broken packages and long solutions.
+
 	* src/generic/problemresolver/problemresolver.h:
 
 	  Fix a big thinko: always enqueue solvers for *both* sides of a

Modified: branches/aptitude-0.3/aptitude/src/cmdline/cmdline_do_action.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/cmdline_do_action.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/cmdline_do_action.cc	Sun Apr 10 03:34:42 2005
@@ -172,7 +172,7 @@
 
   // Ok, see what the aptitude fixer sez.  Try penalizing brokenness
   // fairly heavily:
-  aptitude_resolver resolver(-50, -10);
+  aptitude_resolver resolver(10, 50);
 
   // Try to avoid removing packages; prefer keeping them or even
   // upgrading.