[Aptitude-devel] r3189 - in branches/aptitude-0.3/aptitude: . src/cmdline
Daniel Burrows
dburrows@costa.debian.org
Fri, 29 Apr 2005 16:16:05 +0000
Author: dburrows
Date: Fri Apr 29 16:16:02 2005
New Revision: 3189
Modified:
branches/aptitude-0.3/aptitude/ChangeLog
branches/aptitude-0.3/aptitude/src/cmdline/cmdline_resolver.cc
Log:
Fix a simple logic error.
Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog (original)
+++ branches/aptitude-0.3/aptitude/ChangeLog Fri Apr 29 16:16:02 2005
@@ -2,6 +2,13 @@
* src/cmdline/cmdline_resolver.cc:
+ Uninvert the tweaking logic: now, instead of giving a bonus to
+ removal if the user *didn't* ask for a package to be removed, we
+ give a bonus to removal if the user *did* ask for a package to
+ be removed.
+
+ * src/cmdline/cmdline_resolver.cc:
+
When tweaking scores, generate an end iterator (not an invalid
iterator) for the UNINST 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:16:02 2005
@@ -70,7 +70,7 @@
(*apt_cache_file)->tweak_score(*p, v,
tweak_amt);
- if(!instver.end())
+ if(instver.end())
(*apt_cache_file)->tweak_score(*p, pkgCache::VerIterator(*apt_cache_file),
tweak_amt);
}