[Aptitude-devel] r2967 - branches/aptitude-0.3/aptitude/src/generic/problemresolver

[Daniel Burrows]

Author: dburrows
Date: Sat Apr  9 15:29:33 2005
New Revision: 2967

Modified:
   branches/aptitude-0.3/aptitude/src/generic/problemresolver/aptitude_resolver.h
Log:
Actually, fixing the OR test is the right thing to do here.

Modified: branches/aptitude-0.3/aptitude/src/generic/problemresolver/aptitude_resolver.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/problemresolver/aptitude_resolver.h	(original)
+++ branches/aptitude-0.3/aptitude/src/generic/problemresolver/aptitude_resolver.h	Sat Apr  9 15:29:33 2005
@@ -427,7 +427,7 @@
 	// All conflicts are a conflict alone.  Or something like
 	// that.
 	if(dep_lst->Type == pkgCache::Dep::Conflicts ||
-	   !dep_lst->CompareOp & pkgCache::Dep::Or)
+	   !(dep_lst->CompareOp & pkgCache::Dep::Or))
 	  finished=true;
 	else
 	  {
@@ -452,7 +452,7 @@
 
   bool end() const
   {
-    return finished || dep_lst.end();
+    return finished;
   }
 };
 
@@ -559,7 +559,7 @@
     dep_iterator &operator++()
     {
       // Advance to the end of the OR...
-      while(!dep.end() && dep->CompareOp & pkgCache::Dep::Or)
+      while(!dep.end() && (dep->CompareOp & pkgCache::Dep::Or))
 	++dep;
 
       // ...and beyond!