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

[Daniel Burrows]

Author: dburrows
Date: Sun Apr 10 02:57:51 2005
New Revision: 2998

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver.h
Log:
Fix the version count we report to the problem resolver.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sun Apr 10 02:57:51 2005
@@ -1,5 +1,10 @@
 2005-04-09  Daniel Burrows  <dburrows@debian.org>
 
+	* src/generic/aptitude_resolver.h:
+
+	  Report the correct adjusted version count to the problem
+	  resolver.
+
 	* src/generic/problemresolver/problemresolver.h, src/generic/problemresolver/test.cc:
 
 	  Add asserts in order to try and track down where the IDs that

Modified: branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver.h	(original)
+++ branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver.h	Sun Apr 10 02:57:51 2005
@@ -1044,7 +1044,8 @@
 
   unsigned long get_version_count() const
   {
-    return (*apt_cache_file)->Head().VersionCount;
+    // PackageCount is added to make room for the UNINST versions.
+    return (*apt_cache_file)->Head().VersionCount+(*apt_cache_file)->Head().PackageCount;
   }
 };