[Aptitude-svn-commit] r3872 - in branches/aptitude-0.3/aptitude: .
src/generic
Daniel Burrows
dburrows at costa.debian.org
Tue Aug 16 23:10:35 UTC 2005
Author: dburrows
Date: Tue Aug 16 23:10:32 2005
New Revision: 3872
Modified:
branches/aptitude-0.3/aptitude/ChangeLog
branches/aptitude-0.3/aptitude/src/generic/apt.cc
Log:
Fix or_group_subsumes to not enter an infinite loop.
Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog (original)
+++ branches/aptitude-0.3/aptitude/ChangeLog Tue Aug 16 23:10:32 2005
@@ -1,5 +1,9 @@
2005-08-16 Daniel Burrows <dburrows at debian.org>
+ * src/generic/apt.cc:
+
+ Fix or_group_subsumes to not enter an infinite loop.
+
* src/generic/aptcache.cc, src/generic/aptitude_resolver.cc, src/generic/aptitude_resolver_universe.cc, src/generic/aptitude_resolver_universe.h:
Memoize calls to is_interesting_dep(). The major change caused
Modified: branches/aptitude-0.3/aptitude/src/generic/apt.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/apt.cc (original)
+++ branches/aptitude-0.3/aptitude/src/generic/apt.cc Tue Aug 16 23:10:32 2005
@@ -604,11 +604,11 @@
surrounding_or(d1, start1, end1);
surrounding_or(d2, start2, end2);
- for(pkgCache::DepIterator i = d1; i != end1; ++i)
+ for(pkgCache::DepIterator i = start1; i != end1; ++i)
{
bool found = false;
- for(pkgCache::DepIterator j = d2; j != end2; ++j)
+ for(pkgCache::DepIterator j = start2; j != end2; ++j)
if(subsumes(i, j))
{
found = true;
More information about the Aptitude-svn-commit
mailing list