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

Daniel Burrows dburrows@costa.debian.org
Fri, 22 Apr 2005 23:19:02 +0000


Author: dburrows
Date: Fri Apr 22 23:18:59 2005
New Revision: 3044

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/broken_indicator.cc
Log:
Add a sanity-check.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Fri Apr 22 23:18:59 2005
@@ -1,5 +1,9 @@
 2005-04-22  Daniel Burrows  <dburrows@debian.org>
 
+	* src/broken_indicator.cc:
+
+	  Add a sanity-check.
+
 	* src/generic/aptcache.cc:
 
 	  Also call the package-state-changed signal after an

Modified: branches/aptitude-0.3/aptitude/src/broken_indicator.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/broken_indicator.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/broken_indicator.cc	Fri Apr 22 23:18:59 2005
@@ -77,6 +77,12 @@
       {
 	aptitude_resolver::solution sol=(*apt_cache_file)->get_current_solution();
 
+	if(sol.get_actions().empty())
+	  {
+	    set_fragment(fragf(_("%CInternal error: unexpected null solution.", get_color("Error"))));
+	    return;
+	  }
+
 	int install_count=0, remove_count=0, keep_count=0, upgrade_count=0, downgrade_count=0;
 
 	for(std::map<aptitude_resolver::package,