From: David Kalnischkies <kalnischkies@gmail.com>
Date: Sun, 5 Dec 2010 11:59:07 +0000 (+0100)
Subject: check in the DepCache::SetCandidateVersion that the package is marked to
X-Git-Tag: 0.8.11~5^2^2^2~39
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/758729c8084a19859d3c9ccf948bb2ec507b0d0c?ds=inline;hp=--cc

check in the DepCache::SetCandidateVersion that the package is marked to
be installed before setting the InstallVer as otherwise the Sizes states
will be confused in some cases - this can happen now as SetCandidateRelease
works also on packages which are not installed now (or will never in the
final solution)
---

758729c8084a19859d3c9ccf948bb2ec507b0d0c
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index 4a8e53eb3..594c085a5 100644
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -1523,7 +1523,7 @@ void pkgDepCache::SetCandidateVersion(VerIterator TargetVer, bool const &Pseudo)
    RemoveSizes(Pkg);
    RemoveStates(Pkg);
 
-   if (P.CandidateVer == P.InstallVer)
+   if (P.CandidateVer == P.InstallVer && P.Install() == true)
       P.InstallVer = (Version *)TargetVer;
    P.CandidateVer = (Version *)TargetVer;
    P.Update(Pkg,*this);
@@ -1570,6 +1570,7 @@ bool pkgDepCache::SetCandidateRelease(pkgCache::VerIterator TargetVer,
 					std::string const &TargetRel,
 					std::list<std::pair<pkgCache::VerIterator, pkgCache::VerIterator> > &Changed)
 {
+   ActionGroup group(*this);
    SetCandidateVersion(TargetVer);
 
    if (TargetRel == "installed" || TargetRel == "candidate") // both doesn't make sense in this context