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

[Daniel Burrows]

Author: dburrows
Date: Thu Aug 25 20:23:31 2005
New Revision: 3952

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver_universe.cc
Log:
Fix handling of conflicts-through-provides.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Thu Aug 25 20:23:31 2005
@@ -2,6 +2,10 @@
 
 	* src/generic/aptitude_resolver_universe.cc:
 
+	  Fix handling of conflicts-through-provides.
+
+	* src/generic/aptitude_resolver_universe.cc:
+
 	  Follow Provides in solved_by().
 
 2005-08-24  Daniel Burrows  <dburrows at debian.org>

Modified: branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver_universe.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver_universe.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver_universe.cc	Thu Aug 25 20:23:31 2005
@@ -304,17 +304,14 @@
     }
   else
     {
-      // Since dependencies are never versioned, I never create
-      // dependency objects for versioned dependencies that go through
-      // Provides.
+      // Since provides are never versioned, I never create dependency
+      // objects for versioned dependencies that go through Provides.
       assert(!d.TargetVer());
 
       if(v.get_pkg() != const_cast<pkgCache::PrvIterator &>(prv).OwnerPkg())
 	return false;
       else
-	return v.get_ver() == const_cast<pkgCache::PrvIterator &>(prv).OwnerVer();
-
-      return false;
+	return v.get_ver() != const_cast<pkgCache::PrvIterator &>(prv).OwnerVer();
     }
 }