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

[Daniel Burrows]

Author: dburrows
Date: Sun Aug 21 02:26:07 2005
New Revision: 3939

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/problemresolver/problemresolver.h
Log:
Correct the generation of temporary test conflict sets from solutions:
of course the forbidden version set should have nothing to do
with what goes into the generated set!

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sun Aug 21 02:26:07 2005
@@ -1,5 +1,10 @@
 2005-08-20  Daniel Burrows  <dburrows at debian.org>
 
+	* src/generic/problemresolver/problemresolver.h:
+
+	  Fix a silly error: of course when populating a partial conflict
+	  map, we shouldn't randomly stick the forbidden versions into it.
+
 	* src/generic/matchers.cc:
 
 	  Fix an uninitialized variable usage turned up by compiling with

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	Sun Aug 21 02:26:07 2005
@@ -417,11 +417,6 @@
     for(typename std::map<package, action>::const_iterator si
 	  = s.get_actions().begin(); si != s.get_actions().end(); ++si)
       pc[si->first] = act_conflict(si->second.ver);
-
-    for(typename std::map<version, dep>::const_iterator fi
-	  = s.get_forbidden_versions().begin();
-	fi != s.get_forbidden_versions().end(); ++fi)
-      pc[fi->first.get_package()] = act_conflict(fi->first, fi->second);
   }
 
   /** \return \b true if each element of pc2 is subsumed by an element