[Aptitude-devel] r3061 - in branches/aptitude-0.3/aptitude: . src
Daniel Burrows
dburrows@costa.debian.org
Sat, 23 Apr 2005 01:13:36 +0000
Author: dburrows
Date: Sat Apr 23 01:13:33 2005
New Revision: 3061
Modified:
branches/aptitude-0.3/aptitude/ChangeLog
branches/aptitude-0.3/aptitude/src/broken_indicator.cc
Log:
Fix an assertion failure due to an incorrect assumption.
Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog (original)
+++ branches/aptitude-0.3/aptitude/ChangeLog Sat Apr 23 01:13:33 2005
@@ -1,5 +1,14 @@
2005-04-22 Daniel Burrows <dburrows@debian.org>
+ * src/broken_indicator.cc:
+
+ Fix an assertion failure due to an incorrect assumption.
+
+ * src/broken_indicator.cc:
+
+ Use the new signal to reset the broken indicator at appropriate
+ times.
+
* src/generic/aptcache.cc:
Actually perform the function call so everything compiles.
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 Sat Apr 23 01:13:33 2005
@@ -133,9 +133,13 @@
// The versions shouldn't be equal -- otherwise
// something is majorly wrong.
- assert(cmp!=0);
+ // assert(cmp!=0);
+ //
+ // The above is not true: consider, eg, the case of a
+ // locally compiled package and a standard package.
- if(cmp<0)
+ /** \todo indicate "sidegrades" separately? */
+ if(cmp<=0)
++upgrade_count;
else if(cmp>0)
++downgrade_count;