[Aptitude-devel] r3076 - in branches/aptitude-0.3/aptitude: . src/generic

[Daniel Burrows]

Author: dburrows
Date: Sat Apr 23 15:25:11 2005
New Revision: 3076

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/aptcache.cc
Log:
Score tweaks: make keeps less desirable than upgrades or installs, and don't try so hard to preserve automatic installations.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sat Apr 23 15:25:11 2005
@@ -1,5 +1,12 @@
 2005-04-23  Daniel Burrows  <dburrows@debian.org>
 
+	* src/generic/aptcache.cc:
+
+	  Deprioritize keeps relative to installs/upgrades: the user
+	  rarely wants us to cancel his/her decisions! (removals are still
+	  deep-sixed unless abolutely necessary, though) Also, greatly
+	  *decrease* the bonus for preserving automatic packages.
+
 	* src/ui.cc:
 
 	  Put the broken indicator above the status area, not in it.

Modified: branches/aptitude-0.3/aptitude/src/generic/aptcache.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/aptcache.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/generic/aptcache.cc	Sat Apr 23 15:25:11 2005
@@ -1354,9 +1354,9 @@
 				 aptcfg->FindI(PACKAGE "::ProblemResolver::ResolutionScore", 50));
 
   resolver->add_action_scores(aptcfg->FindI(PACKAGE "::ProblemResolver::PreserveManualScore", 40),
-			      aptcfg->FindI(PACKAGE "::ProblemResolver::PreserveAutoScore", 35),
+			      aptcfg->FindI(PACKAGE "::ProblemResolver::PreserveAutoScore", 0),
 			      aptcfg->FindI(PACKAGE "::ProblemResolver::RemoveScore", -300),
-			      aptcfg->FindI(PACKAGE "::ProblemResolver::KeepScore", -10),
+			      aptcfg->FindI(PACKAGE "::ProblemResolver::KeepScore", -50),
 			      aptcfg->FindI(PACKAGE "::ProblemResolver::InstallScore", -20),
 			      aptcfg->FindI(PACKAGE "::ProblemResolver::UpgradeScore", -15),
 			      aptcfg->FindI(PACKAGE "::ProblemResolver::NonDefaultScore", -40),