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

[Daniel Burrows]

Author: dburrows
Date: Mon May  2 01:47:50 2005
New Revision: 3253

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver.h
Log:
Fix reversed logic in checking whether a Conflicts is broken.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Mon May  2 01:47:50 2005
@@ -1,5 +1,9 @@
 2005-05-01  Daniel Burrows  <dburrows@debian.org>
 
+	* src/generic/aptitude_resolver.h:
+
+	Fix reversed logic in checking whether a Conflicts is broken.
+
 	* src/generic/aptitude_resolver.h, src/generic/problemresolver/problemresolver.h, src/generic/problemresolver/test.cc:
 
 	Fix a mistake in how successors are generated -- of course we have

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	Mon May  2 01:47:50 2005
@@ -970,10 +970,10 @@
 
 	  pkgCache::VerIterator direct_ver=S.version_of(aptitude_resolver_package(const_cast<pkgCache::DepIterator &>(start).TargetPkg(), cache)).get_ver();
 
-	  if(!(!direct_ver.end() &&
-	       _system->VS->CheckDep(direct_ver.VerStr(),
-				     start->CompareOp,
-				     start.TargetVer())))
+	  if(!direct_ver.end() &&
+	     _system->VS->CheckDep(direct_ver.VerStr(),
+				   start->CompareOp,
+				   start.TargetVer()))
 	    return true;
 	  else
 	    return false;