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

[Daniel Burrows]

Author: dburrows
Date: Sun Apr 10 03:06:18 2005
New Revision: 2999

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver.h
Log:
Fix the version IDs as reported by the glue layer. (oops)

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sun Apr 10 03:06:18 2005
@@ -2,6 +2,11 @@
 
 	* src/generic/aptitude_resolver.h:
 
+	  Fix the version sent to the problem resolver (should be
+	  pkg->ID+VersionCount, not pkg->ID+PackageCount).
+
+	* src/generic/aptitude_resolver.h:
+
 	  Report the correct adjusted version count to the problem
 	  resolver.
 

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 03:06:18 2005
@@ -132,7 +132,7 @@
       // there's more to copy.  I could also teach the resolver about
       // "null" versions...but that would mean a bunch of pointless
       // special-casing caller-side anyway.
-      return (*apt_cache_file)->Head().PackageCount+pkg->ID;
+      return (*apt_cache_file)->Head().VersionCount+pkg->ID;
   }
 
   const char *get_name() const