[Aptitude-devel] r2962 - in branches/aptitude-0.3/aptitude: . src/generic/problemresolver
Daniel Burrows
dburrows@costa.debian.org
Sat, 09 Apr 2005 14:47:28 +0000
Author: dburrows
Date: Sat Apr 9 14:47:25 2005
New Revision: 2962
Modified:
branches/aptitude-0.3/aptitude/ChangeLog
branches/aptitude-0.3/aptitude/src/generic/problemresolver/aptitude_resolver.h
Log:
Include UNINST in version iteration.
Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog (original)
+++ branches/aptitude-0.3/aptitude/ChangeLog Sat Apr 9 14:47:25 2005
@@ -1,5 +1,11 @@
2005-04-09 Daniel Burrows <dburrows@debian.org>
+ * src/generic/problemresolver/aptitude_resolver.h:
+
+ Make sure to include UNINST in version iteration (avoid
+ adding an extraneous bool by overloading pkg to track
+ end-ness).
+
* src/generic/problemresolver/problemresolver.h:
Fix the dump output (again) to comply with the input spec.
Modified: branches/aptitude-0.3/aptitude/src/generic/problemresolver/aptitude_resolver.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/problemresolver/aptitude_resolver.h (original)
+++ branches/aptitude-0.3/aptitude/src/generic/problemresolver/aptitude_resolver.h Sat Apr 9 14:47:25 2005
@@ -227,13 +227,16 @@
version_iterator &operator++()
{
- ++ver;
+ if(!ver.end())
+ ++ver;
+ else
+ pkg=pkgCache::PkgIterator();
return *this;
}
bool end() const
{
- return ver.end();
+ return pkg.end();
}
};