[Aptitude-svn-commit] r3987 - in branches/aptitude-0.3/aptitude: .
src/generic/problemresolver
Daniel Burrows
dburrows at costa.debian.org
Tue Aug 30 00:46:15 UTC 2005
Author: dburrows
Date: Tue Aug 30 00:46:12 2005
New Revision: 3987
Modified:
branches/aptitude-0.3/aptitude/ChangeLog
branches/aptitude-0.3/aptitude/src/generic/problemresolver/problemresolver.h
Log:
Fix compilation error in contains_rejected.
Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog (original)
+++ branches/aptitude-0.3/aptitude/ChangeLog Tue Aug 30 00:46:12 2005
@@ -1,5 +1,9 @@
2005-08-29 Daniel Burrows <dburrows at debian.org>
+ * src/generic/problemresolver/problemresolver.h:
+
+ Fix compilation error in contains_rejected.
+
* src/generic/immset.h:
Doh, fix for_each.
Modified: branches/aptitude-0.3/aptitude/src/generic/problemresolver/problemresolver.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/problemresolver/problemresolver.h (original)
+++ branches/aptitude-0.3/aptitude/src/generic/problemresolver/problemresolver.h Tue Aug 30 00:46:12 2005
@@ -1184,10 +1184,14 @@
*/
bool contains_rejected(const solution &s) const
{
- for(typename std::set<version>::const_iterator ur_iter
- = user_rejected.begin(); ur != user_rejected.end(); ++ur)
- if(version_of(ur->get_package()) == *ur)
- return true;
+ for(typename std::set<version>::const_iterator uri
+ = user_rejected.begin(); uri != user_rejected.end(); ++uri)
+ {
+ typename imm::map<package, action>::node found = s.get_actions().lookup(uri->get_package());
+
+ if(found.isValid())
+ return true;
+ }
return false;
}
More information about the Aptitude-svn-commit
mailing list