[Aptitude-svn-commit] r3716 - in branches/aptitude-0.3/aptitude: .
src/generic
Daniel Burrows
dburrows at costa.debian.org
Sat Aug 6 15:41:40 UTC 2005
Author: dburrows
Date: Sat Aug 6 15:41:38 2005
New Revision: 3716
Modified:
branches/aptitude-0.3/aptitude/ChangeLog
branches/aptitude-0.3/aptitude/src/generic/aptcache.cc
Log:
Be more careful about writing out and reading in candidate version information.
Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog (original)
+++ branches/aptitude-0.3/aptitude/ChangeLog Sat Aug 6 15:41:38 2005
@@ -1,5 +1,11 @@
2005-08-06 Daniel Burrows <dburrows at debian.org>
+ * src/generic/aptcache.cc:
+
+ Only write the target version if the user actually planned to
+ install it; only set up an installation if the user requested it
+ previously (i.e., the Upgrade field was written).
+
* src/pkg_item.cc, src/pkg_ver_item.cc, src/ui.cc:
Always destroy progress bars when we're done with them, so they
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 Sat Aug 6 15:41:38 2005
@@ -347,7 +347,7 @@
// FIXME: should I check this for "unknown" packages as well?
// Does that even make sense??
- if(!estate.candver.empty())
+ if(!estate.candver.empty() && estate.upgrade)
{
for(pkgCache::VerIterator ver=i.VersionList(); !ver.end(); ++ver)
if(ver.VerStr()==estate.candver)
@@ -525,9 +525,8 @@
string tailstr;
- if(!estate.candver.empty() &&
- !i.CurrentVer().end() &&
- i.CurrentVer().VerStr() != estate.candver &&
+ if(state.Install() &&
+ !estate.candver.empty() &&
GetCandidateVer(i).VerStr() != estate.candver)
tailstr = "Version: " + estate.candver + "\n";
More information about the Aptitude-svn-commit
mailing list