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

[Daniel Burrows]

Author: dburrows
Date: Sat Apr 23 03:41:32 2005
New Revision: 3071

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/aptcache.cc
Log:
Fix an assertion failure hackily.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sat Apr 23 03:41:32 2005
@@ -1,5 +1,9 @@
 2005-04-22  Daniel Burrows  <dburrows@debian.org>
 
+	* src/generic/aptcache.cc:
+
+	  Avoid the dread assertion failure in a slightly hacky way.
+
 	* src/cmdline/cmdline_do_action.cc, src/generic/aptcache.cc, src/generic/aptitude_resolver.cc, src/generic/aptitude_resolver.h, src/generic/problemresolver/problemresolver.h:
 
 	  Instead of automatically floating complete solutions to the head

Modified: branches/aptitude-0.3/aptitude/src/generic/aptcache.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/aptcache.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/generic/aptcache.cc	Sat Apr 23 03:41:32 2005
@@ -877,8 +877,11 @@
 
       mark_and_sweep(undo);
 
-      if(BrokenCount()>0)
-	create_resolver();
+      //if(BrokenCount()>0)
+      //create_resolver();
+      //
+      // EW - rely on the fact that mark_and_sweep implicitly calls
+      // begin/end_action_group(), which in turn does just this.
 
       package_state_changed();
     }