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

[Daniel Burrows]

Author: dburrows
Date: Tue Aug 16 17:19:41 2005
New Revision: 3863

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/problemresolver/problemresolver.h
Log:
Fix the handling of soft deps with exactly one resolver.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Tue Aug 16 17:19:41 2005
@@ -1,3 +1,10 @@
+2005-08-16  Daniel Burrows  <dburrows at debian.org>
+
+	* src/generic/problemresolver/problemresolver.h:
+
+	  When looking for forced deps, leave soft deps with exactly one
+	  resolver alone instead of discarding them.
+
 2005-08-15  Daniel Burrows  <dburrows at debian.org>
 
 	* src/generic/problemresolver/problemresolver.h:

Modified: branches/aptitude-0.3/aptitude/src/generic/problemresolver/problemresolver.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/problemresolver/problemresolver.h	(original)
+++ branches/aptitude-0.3/aptitude/src/generic/problemresolver/problemresolver.h	Tue Aug 16 17:19:41 2005
@@ -1424,7 +1424,7 @@
 	// Soft dependencies shouldn't be forced, as you have the
 	// option of discarding them.
 	if(d.is_soft())
-	  return true;
+	  return false;
 
 	if(debug)
 	    std::cout << "Forced resolution of " << d