[Aptitude-svn-commit] r4126 - in branches/aptitude-0.3/aptitude: . doc/en src/cmdline

[Daniel Burrows]

Author: dburrows
Date: Tue Sep 20 05:13:12 2005
New Revision: 4126

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/doc/en/aptitude.xml
   branches/aptitude-0.3/aptitude/src/cmdline/cmdline_resolver.cc
Log:
Make the version score tweaking default to 0.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Tue Sep 20 05:13:12 2005
@@ -1,5 +1,9 @@
 2005-09-19  Daniel Burrows  <dburrows at debian.org>
 
+	* doc/en/aptitude.xml, src/cmdline/cmdline_resolver.cc:
+
+	  Make the version score tweaking default to 0.
+
 	* src/generic/resolver_manager.cc:
 
 	  When the resolver is interrupted, put the job we were working on

Modified: branches/aptitude-0.3/aptitude/doc/en/aptitude.xml
==============================================================================
--- branches/aptitude-0.3/aptitude/doc/en/aptitude.xml	(original)
+++ branches/aptitude-0.3/aptitude/doc/en/aptitude.xml	Tue Sep 20 05:13:12 2005
@@ -7488,7 +7488,7 @@
 
 	    <seglistitem id='configCmdLine-Request-Strictness'>
 	      <seg><literal>Aptitude::CmdLine::Request-Strictness</literal></seg>
-	      <seg><literal>1000</literal></seg>
+	      <seg><literal>0</literal></seg>
 	      <seg>
 		When run in command-line mode, if dependency problems
 		are encountered, &aptitude; will add this value to the

Modified: branches/aptitude-0.3/aptitude/src/cmdline/cmdline_resolver.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/cmdline_resolver.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/cmdline_resolver.cc	Tue Sep 20 05:13:12 2005
@@ -89,7 +89,7 @@
   if(force_no_change && resman->resolver_exists())
     {
       pkgset *sets[4]={&to_install, &to_hold, &to_remove, &to_purge};
-      int tweak_amt=aptcfg->FindI(PACKAGE "::CmdLine::Request-Strictness", 1000);
+      int tweak_amt=aptcfg->FindI(PACKAGE "::CmdLine::Request-Strictness", 0);
 
       for(int i=0; i<4; ++i)
 	{