[Aptitude-devel] r3191 - in branches/aptitude-0.3/aptitude: . src/cmdline
Daniel Burrows
dburrows@costa.debian.org
Fri, 29 Apr 2005 16:26:02 +0000
Author: dburrows
Date: Fri Apr 29 16:26:00 2005
New Revision: 3191
Modified:
branches/aptitude-0.3/aptitude/ChangeLog
branches/aptitude-0.3/aptitude/src/cmdline/cmdline_resolver.cc
Log:
Don't try so hard to obey the user's command-line instructions.
Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog (original)
+++ branches/aptitude-0.3/aptitude/ChangeLog Fri Apr 29 16:26:00 2005
@@ -2,6 +2,12 @@
* src/cmdline/cmdline_resolver.cc:
+ Be less strict about obeying command-line instructions, to avoid
+ spending lots of time searching really bad solutions if the user
+ asks for something impossible.
+
+ * src/cmdline/cmdline_resolver.cc:
+
Oops, iterate over the whole version list, not just the part of
it that follows the current version.
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 Fri Apr 29 16:26:00 2005
@@ -52,7 +52,7 @@
if(force_no_change && (*apt_cache_file)->resolver_exists())
{
pkgset *sets[4]={&to_install, &to_hold, &to_remove, &to_purge};
- int tweak_amt=aptcfg->FindI(PACKAGE "::CmdLine::Request-Strictness", 10000);
+ int tweak_amt=aptcfg->FindI(PACKAGE "::CmdLine::Request-Strictness", 1000);
for(int i=0; i<4; ++i)
{