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

[Daniel Burrows]

Author: dburrows
Date: Sun Apr 10 02:13:46 2005
New Revision: 2992

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver.h
Log:
Fix a silly logical error.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sun Apr 10 02:13:46 2005
@@ -2,6 +2,11 @@
 
 	* src/generic/aptitude_resolver.h:
 
+	  Fix some backwards logic that was used when finding broken deps
+	  (it only found *non*-broken deps).
+
+	* src/generic/aptitude_resolver.h:
+
 	  Fix an infinite loop in the revdep_iterator.
 
 	* src/generic/aptitude_resolver.cc, src/generic/aptitude_resolver.h:

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:13:46 2005
@@ -887,8 +887,8 @@
     void normalize()
     {
       while(!the_dep.end() &&
-	    !the_dep.IsCritical() &&
-	    dep_is_inst_broken(the_dep))
+	    !(the_dep.IsCritical() &&
+	      dep_is_inst_broken(the_dep)))
 	++the_dep;
 
       while(the_dep.end() && !pkg.end())
@@ -908,8 +908,8 @@
 		the_dep=ver.DependsList();
 
 	      while(!the_dep.end() &&
-		    !the_dep.IsCritical() &&
-		    dep_is_inst_broken(the_dep))
+		     !(the_dep.IsCritical() &&
+		       dep_is_inst_broken(the_dep)))
 		++the_dep;
 	    }
 	}