[Aptitude-svn-commit] r3930 - in branches/aptitude-0.3/aptitude: .
src/generic
Daniel Burrows
dburrows at costa.debian.org
Fri Aug 19 22:18:48 UTC 2005
Author: dburrows
Date: Fri Aug 19 22:18:44 2005
New Revision: 3930
Modified:
branches/aptitude-0.3/aptitude/ChangeLog
branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver_universe.cc
Log:
Fix aptitude_resolver_dep::solved_by().
Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog (original)
+++ branches/aptitude-0.3/aptitude/ChangeLog Fri Aug 19 22:18:44 2005
@@ -1,5 +1,10 @@
2005-08-19 Daniel Burrows <dburrows at debian.org>
+ * src/generic/aptitude_resolver_universe.cc:
+
+ Fix solved_by(): it was returning "true" for most non-virtual
+ Conflicts (whoops).
+
* src/broken_indicator.cc:
Base the decision on whether to really update the broken
Modified: branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver_universe.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver_universe.cc (original)
+++ branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver_universe.cc Fri Aug 19 22:18:44 2005
@@ -276,9 +276,9 @@
}
else if(prv.end())
{
- // Check the non-virtual part of the conflict: either the
- // package differs or the version doesn't match.
- return (d.TargetPkg() != v.get_pkg() ||
+ // Check the non-virtual part of the conflict: the package is
+ // the same and the version **doesn't** match.
+ return (d.TargetPkg() == v.get_pkg() &&
!(!d.TargetVer() || _system->VS->CheckDep(v.get_ver().VerStr(),
d->CompareOp,
d.TargetVer())));
More information about the Aptitude-svn-commit
mailing list