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

[Daniel Burrows]

Author: dburrows
Date: Thu Sep 22 19:06:51 2005
New Revision: 4176

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/problemresolver/problemresolver.h
Log:
Allow mandated versions to be ignored in favor of other mandated versions.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Thu Sep 22 19:06:51 2005
@@ -1,5 +1,10 @@
 2005-09-22  Daniel Burrows  <dburrows at debian.org>
 
+	* src/generic/problemresolver/problemresolver.h:
+
+	  Allow mandated versions to be ignored in favor of other mandated
+	  versions, and don't special-case other versions of the package.
+
 	* doc/en/aptitude.xml, src/defaults.cc:
 
 	  Don't explicitly set the background color in package colors, so

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	Thu Sep 22 19:06:51 2005
@@ -1334,16 +1334,13 @@
 	 // If it's already being installed, then we're fine.
 	 if(v == *ai)
 	   continue;
-	 // Don't allow another version of this package to be
-	 // installed.
-	 else if(v != ai->get_package().current_version())
-	   return true;
 
 	 // Check (very slowly) whether we made a decision where we had
 	 // the opportunity to use this version (and of course didn't).
 	 for(typename imm::map<package, action>::const_iterator si = s.get_actions().begin();
 	     si != s.get_actions().end(); ++si)
-	   if(si->second.d.solved_by(*ai))
+	   if(si->second.d.solved_by(*ai) &&
+	      user_mandated.find(si->second.ver) == user_mandated.end())
 	     {
 	       if(debug)
 		 {