[Aptitude-devel] r3104 - in branches/aptitude-0.3/aptitude: . src

[Daniel Burrows]

Author: dburrows
Date: Wed Apr 27 00:20:41 2005
New Revision: 3104

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/solution_fragment.cc
Log:
Don't die with an assertion failure when describing an already-applied solution.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Wed Apr 27 00:20:41 2005
@@ -1,5 +1,11 @@
 2005-04-26  Daniel Burrows  <dburrows@debian.org>
 
+	* src/solution_fragment.cc:
+
+	  Don't require that the solution is a sensible solution right
+	  this instance; this allows a fragment describing an
+	  already-applied solution to be generated.
+
 	* src/ui.cc:
 
 	  Eliminate all uses of try_fix_broken() in the pre-installation

Modified: branches/aptitude-0.3/aptitude/src/solution_fragment.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/solution_fragment.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/solution_fragment.cc	Wed Apr 27 00:20:41 2005
@@ -90,12 +90,8 @@
     {
       pkgCache::PkgIterator pkg=i->first.get_pkg();
       pkgCache::VerIterator curver=pkg.CurrentVer();
-      pkgCache::VerIterator instver=(*apt_cache_file)[pkg].InstVerIter(*apt_cache_file);
       pkgCache::VerIterator newver=i->second.ver.get_ver();
 
-      // If not, we have a problem.
-      assert(instver!=newver);
-
       if(curver.end())
 	install_packages.push_back(newver);
       else if(newver.end())