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

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


Author: dburrows
Date: Fri Apr 22 02:35:28 2005
New Revision: 3036

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/aptcache.cc
Log:
Fix a silly crash caused by using a global variable instead of 'this'.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Fri Apr 22 02:35:28 2005
@@ -1,5 +1,10 @@
 2005-04-21  Daniel Burrows  <dburrows@debian.org>
 
+	* src/generic/aptcache.cc:
+
+	  Look up BrokenCount on "this", not on the global apt_cache_file
+	  variable (which might not be initialized yet).
+
 	* src/pkg_view.cc:
 
 	  Ignore both horizontal and vertical size requests for main

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	Fri Apr 22 02:35:28 2005
@@ -731,7 +731,7 @@
 	}
     }
 
-  if((*apt_cache_file)->BrokenCount()>0)
+  if(BrokenCount()>0)
     create_resolver();
 }