[Aptitude-svn-commit] r3873 - in branches/aptitude-0.3/aptitude: . src/generic

[Daniel Burrows]

Author: dburrows
Date: Tue Aug 16 23:19:46 2005
New Revision: 3873

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/apt.cc
Log:
Fix the interpretation of >= dependencies in subsumes().

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Tue Aug 16 23:19:46 2005
@@ -2,6 +2,13 @@
 
 	* src/generic/apt.cc:
 
+	  Fix subsumes(): when the first dependency used a >= comparison,
+	  it was checking for (> | <= | =) instead of (> | >= | =).  This
+	  resulted, unsurprisingly, in >= recommendations that hadn't even
+	  changed appearing as soft dependencies to the resolver.
+
+	* src/generic/apt.cc:
+
 	  Fix or_group_subsumes to not enter an infinite loop.
 
 	* src/generic/aptcache.cc, src/generic/aptitude_resolver.cc, src/generic/aptitude_resolver_universe.cc, src/generic/aptitude_resolver_universe.h:

Modified: branches/aptitude-0.3/aptitude/src/generic/apt.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/apt.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/generic/apt.cc	Tue Aug 16 23:19:46 2005
@@ -566,7 +566,7 @@
 	case pkgCache::Dep::GreaterEq:
 	  return
 	    (t2 == pkgCache::Dep::Greater ||
-	     t2 == pkgCache::Dep::LessEq ||
+	     t2 == pkgCache::Dep::GreaterEq ||
 	     t2 == pkgCache::Dep::Equals) &&
 	    cmpresult <= 0;
 	case pkgCache::Dep::Less: