[Aptitude-devel] r3224 - in branches/aptitude-0.3/aptitude: . doc/en

Daniel Burrows dburrows@costa.debian.org
Sun, 01 May 2005 14:07:03 +0000


Author: dburrows
Date: Sun May  1 14:07:00 2005
New Revision: 3224

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/doc/en/aptitude.xml
Log:
Finish documenting the new configuration options.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sun May  1 14:07:00 2005
@@ -1,5 +1,9 @@
 2005-05-01  Daniel Burrows  <dburrows@debian.org>
 
+	* doc/en/aptitude.xml:
+
+	  Finish documenting the new configuration options.
+
 	* src/generic/aptitude_resolver.cc:
 
 	  When tweaking scores based on priority, don't tweak the score of

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	Sun May  1 14:07:00 2005
@@ -6706,6 +6706,17 @@
 	      </seg>
 	    </seglistitem>
 
+	    <seglistitem id='configCmdLine-Request-Strictness'>
+	      <seg><literal>Aptitude::CmdLine::Request-Strictness</literal></seg>
+	      <seg><literal>1000</literal></seg>
+	      <seg>
+		When run in command-line mode, if dependency problems
+		are encountered, &aptitude; will add this value to the
+		problem resolver score of each action that you
+		explicitly request.
+	      </seg>
+	    </seglistitem>
+
 	    <seglistitem id='configCmdLine-Download-Only'>
 	      <seg><literal>Aptitude::CmdLine::Download-Only</literal></seg>
 	      <seg><literal>false</literal></seg>
@@ -6968,6 +6979,28 @@
 	      </seg>
 	    </seglistitem>
 
+	    <seglistitem id='configProblemResolver-ExtraScore'>
+	      <seg><literal>Aptitude::ProblemResolver::ExtraScore</literal></seg>
+	      <seg><literal>5</literal></seg>
+
+	      <seg>
+		Any version of a package whose Priority is
+		<quote>extra</quote> will have this many points added
+		to its score.
+	      </seg>
+	    </seglistitem>
+
+	    <seglistitem id='configProblemResolver-ImportantScore'>
+	      <seg><literal>Aptitude::ProblemResolver::ImportantScore</literal></seg>
+	      <seg><literal>5</literal></seg>
+
+	      <seg>
+		Any version of a package whose Priority is
+		<quote>important</quote> will have this many points
+		added to its score.
+	      </seg>
+	    </seglistitem>
+
 	    <seglistitem id='configProblemResolver-Infinity'>
 	      <seg><literal>Aptitude::ProblemResolver::Infinity</literal></seg>
 	      <seg><literal>1000000</literal></seg>
@@ -6980,6 +7013,27 @@
 	      </seg>
 	    </seglistitem>
 
+	    <seglistitem id='configProblemResolver-InstallScore'>
+	      <seg><literal>Aptitude::ProblemResolver::InstallScore</literal></seg>
+	      <seg><literal>-20</literal></seg>
+	      <seg>
+		How much weight the problem resolver should give to
+		installing a package, if the package is not already
+		going to be installed.
+	      </seg>
+	    </seglistitem>
+
+	    <seglistitem id='configProblemResolver-KeepScore'>
+	      <seg><literal>Aptitude::ProblemResolver::KeepScore</literal></seg>
+	      <seg><literal>-50</literal></seg>
+	      <seg>
+		How much weight the problem resolver should give to
+		keeping a package in its current state, if that
+		package is not already going to be kept in its current
+		state.
+	      </seg>
+	    </seglistitem>
+
 	    <seglistitem id='configProblemResolver-MaxSuccessors'>
 	      <seg><literal>Aptitude::ProblemResolver::Max-Successors</literal></seg>
 	      <seg><literal>0</literal></seg>
@@ -6997,17 +7051,107 @@
 	      </seg>
 	    </seglistitem>
 
+	    <seglistitem id='configProblemResolver-NonDefaultScore'>
+	      <seg><literal>Aptitude::Problem-Resolver::NonDefaultScore</literal></seg>
+	      <seg><literal>-40</literal></seg>
+	      <seg>
+		How much weight the problem resolver should give to
+		installing a non-default version of the package (one
+		that is not the current version and not the
+		<quote>candidate version</quote>).
+	      </seg>
+	    </seglistitem>
+
+	    <seglistitem id='configProblemResolver-OptionalScore'>
+	      <seg><literal>Aptitude::ProblemResolver::OptionalScore</literal></seg>
+	      <seg><literal>5</literal></seg>
+
+	      <seg>
+		Any version of a package whose Priority is
+		<quote>optional</quote> will have this many points
+		added to its score.
+	      </seg>
+	    </seglistitem>
+
+	    <seglistitem id='configProblemResolver-PreserveAutoScore'>
+	      <seg><literal>Aptitude::Problem-Resolver::PreserveAutoScore</literal></seg>
+	      <seg><literal>0</literal></seg>
+	      <seg>
+		How much weight the problem resolver should give to
+		preserving automatic installations or removals.
+	      </seg>
+	    </seglistitem>
+
+	    <seglistitem id='configProblemResolver-PreserveManualScore'>
+	      <seg><literal>Aptitude::Problem-Resolver::PreserveManualScore</literal></seg>
+	      <seg><literal>40</literal></seg>
+	      <seg>
+		How much weight the problem resolver should give to
+		preserving explicit user selections.
+	      </seg>
+	    </seglistitem>
+
 	    <seglistitem id='configProblemResolver-ResolutionScore'>
 	      <seg><literal>Aptitude::Problem-Resolver::ResolutionScore</literal></seg>
 	      <seg><literal>50</literal></seg>
 
 	      <seg>
 		In addition to all other scoring factors, proposed
-		solutions that actually resolver all unsatisfied
+		solutions that actually resolve all unsatisfied
 		dependencies are awarded this many extra points.
 	      </seg>
 	    </seglistitem>
 
+	    <seglistitem id='configProblemResolver-RemoveScore'>
+	      <seg><literal>Aptitude::Problem-Resolver::RemoveScore</literal></seg>
+	      <seg><literal>-300</literal></seg>
+	      <seg>
+		How much weight the problem resolver should give to
+		removing a package (if it is not already marked for
+		removal).
+	      </seg>
+	    </seglistitem>
+
+	    <seglistitem id='configProblemResolver-RequiredScore'>
+	      <seg><literal>Aptitude::ProblemResolver::RequiredScore</literal></seg>
+	      <seg><literal>4</literal></seg>
+
+	      <seg>
+		Any version of a package whose Priority is
+		<quote>required</quote> will have this many points
+		added to its score.
+	      </seg>
+	    </seglistitem>
+
+	    <seglistitem id='configProblemResolver-StandardScore'>
+	      <seg><literal>Aptitude::ProblemResolver::StandardScore</literal></seg>
+	      <seg><literal>3</literal></seg>
+
+	      <seg>
+		Any version of a package whose Priority is
+		<quote>standard</quote> will have this many points
+		added to its score.
+	      </seg>
+	    </seglistitem>
+
+	    <seglistitem id='configProblemResolver-StepLimit'>
+	      <seg><literal>Aptitude::ProblemResolver::StepLimit</literal></seg>
+	      <seg><literal>100</literal></seg>
+	      <seg>
+		The maximum number of <quote>steps</quote> which
+		should be performed by the problem resolver on each
+		attempt to find a solution to a dependency problem.
+		Decreasing this number will make the program
+		<quote>give up</quote> sooner; increasing it will
+		permit the search for a solution to consume much more
+		time and memory before it is aborted.  The default
+		value is large enough to accomodate commonly
+		encountered situations, while preventing the program
+		from <quote>blowing up</quote> if an overly
+		complicated problem is encountered.
+	      </seg>
+	    </seglistitem>
+
 	    <seglistitem id='configProblemResolver-StepScore'>
 	      <seg><literal>Aptitude::ProblemResolver::StepScore</literal></seg>
 	      <seg><literal>-10</literal></seg>
@@ -7020,6 +7164,17 @@
 	      </seg>
 	    </seglistitem>
 
+	    <seglistitem id='configProblemResolver-UpgradeScore'>
+	      <seg><literal>Aptitude::ProblemResolver::UpgradeScore</literal></seg>
+	      <seg><literal>-15</literal></seg>
+	      <seg>
+		How much weight the problem resolver should give to
+		upgrading (or downgrading) a package to its candidate
+		version, if the package was not already going to be
+		upgraded.
+	      </seg>
+	    </seglistitem>
+
 	    <seglistitem id='configSuggests-Important'>
 	      <seg><literal>Aptitude::Suggests-Important</literal></seg>