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

Daniel Burrows dburrows at costa.debian.org
Fri Aug 26 19:04:37 UTC 2005


Author: dburrows
Date: Fri Aug 26 19:04:28 2005
New Revision: 3968

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/problemresolver/problemresolver.h
Log:
Fix the generation of conflicts from forbiddings.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Fri Aug 26 19:04:28 2005
@@ -2,6 +2,12 @@
 
 	* src/generic/problemresolver/problemresolver.h:
 
+	  Fix the generation of conflicts from forbiddings: if a -> b c
+	  and a was removed, an attempt to install b would generate a
+	  conflict against b rather than against a.
+
+	* src/generic/problemresolver/problemresolver.h:
+
 	  Fix an assertion failure: when re-processing a solution that's
 	  been forced, remember that the iteration over dependencies
 	  should be over the new solution's dependency set, not the old

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	Fri Aug 26 19:04:28 2005
@@ -1452,7 +1452,7 @@
 			<< v.get_name() << ": forbidden by the resolution of "
 			<< found->second << std::endl;
 
-	    out_act.ver = s.version_of(v.get_package());
+	    out_act.ver = s.version_of(found->second.get_source().get_package());
 	    out_act.d   = found->second;
 	    out_act.from_dep_source = true;
 



More information about the Aptitude-svn-commit mailing list