[Aptitude-svn-commit] r4012 - in branches/aptitude-0.3/aptitude: .
src/generic
Daniel Burrows
dburrows at costa.debian.org
Wed Aug 31 16:54:06 UTC 2005
Author: dburrows
Date: Wed Aug 31 16:54:03 2005
New Revision: 4012
Modified:
branches/aptitude-0.3/aptitude/ChangeLog
branches/aptitude-0.3/aptitude/src/generic/aptcache.cc
Log:
Fix the bug where aptitude would follow sticky selections on dist-upgrade.
Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog (original)
+++ branches/aptitude-0.3/aptitude/ChangeLog Wed Aug 31 16:54:03 2005
@@ -1,5 +1,11 @@
2005-08-31 Daniel Burrows <dburrows at debian.org>
+ * src/generic/aptcache.cc:
+
+ In mark_all_upgradable, only mark packages that are already
+ installed; don't flag uninstalled but stickily-to-be-installed
+ packages for installation. (Closes: #317885)
+
* src/generic/aptitude_resolver_universe.h, src/generic/apt.cc, src/generic/apt.h:
Pass the package cache into surrounding_or when calling it
Modified: branches/aptitude-0.3/aptitude/src/generic/aptcache.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/aptcache.cc (original)
+++ branches/aptitude-0.3/aptitude/src/generic/aptcache.cc Wed Aug 31 16:54:03 2005
@@ -467,7 +467,7 @@
}
break;
case pkgCache::State::Install:
- if(state.Status>0 && !is_held(i))
+ if(!i.CurrentVer().end() && state.Status>0 && !is_held(i))
{
dirty=true;
More information about the Aptitude-svn-commit
mailing list