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

Daniel Burrows dburrows at costa.debian.org
Tue Aug 16 01:05:14 UTC 2005


Author: dburrows
Date: Tue Aug 16 01:05:11 2005
New Revision: 3859

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/problemresolver/solution.h
Log:
Insert new deps into the set of unresolved soft deps, don't erase them.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Tue Aug 16 01:05:11 2005
@@ -1,5 +1,10 @@
 2005-08-15  Daniel Burrows  <dburrows at debian.org>
 
+	* src/generic/problemresolver/solution.h:
+
+	  Uh, yeah, let's construct the set of unresolved soft deps by
+	  *inserting* elements instead of removing them, eh?
+
 	* tests/test_resolver.cc:
 
 	  Fix the solution test to not require an operator<.

Modified: branches/aptitude-0.3/aptitude/src/generic/problemresolver/solution.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/problemresolver/solution.h	(original)
+++ branches/aptitude-0.3/aptitude/src/generic/problemresolver/solution.h	Tue Aug 16 01:05:11 2005
@@ -146,7 +146,7 @@
       assert(broken_deps.find(ignore) != broken_deps.end());
 
       broken_deps.erase(ignore);
-      unresolved_soft_deps.erase(ignore);
+      unresolved_soft_deps.insert(ignore);
     }
 
     /** Construct a new solution_rep.  The initial reference count



More information about the Aptitude-svn-commit mailing list