darktemplar/apt
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

* apt-pkg/algorithms.cc: mark all installed packages first

Browse Source 
Mark all installed non-obsoleted packages first without auto
installation in a dist-upgrade.

Based on upstream commit c427b1e218e61bd1aacbddf9013e58b8aa445a7c.
This commit is contained in:
Gleb Fotengauer-Malinovskiy 2014-06-25 19:02:02 +04:00
parent dceb12217d
commit e2184306b2
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
apt/apt-pkg/algorithms.cc
View File

@ -337,6 +337,32 @@ bool pkgFixBroken(pkgDepCache &Cache)
*/
bool pkgDistUpgrade(pkgDepCache &Cache)
{
/* Upgrade all installed packages first without autoinst to help the resolver
in versioned or-groups to upgrade the old solver instead of installing
a new one (if the old solver is not the first one [anymore]) */
for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; ++I)
// ALT:2014-06-25
if (I->CurrentVer != 0)
{
// Was it obsoleted?
bool Obsoleted = false;
for (pkgCache::DepIterator D = I.RevDependsList(); D.end() == false; D++)
{
if (D->Type == pkgCache::Dep::Obsoletes &&
Cache[D.ParentPkg()].CandidateVer != 0 &&
Cache[D.ParentPkg()].CandidateVerIter(Cache).Downloadable() == true &&
(pkgCache::Version*)D.ParentVer() == Cache[D.ParentPkg()].CandidateVer &&
Cache.VS().CheckDep(I.CurrentVer().VerStr(), D) == true &&
Cache.GetPkgPriority(D.ParentPkg()) >= Cache.GetPkgPriority(I))
{
Obsoleted = true;
break;
}
}
if (Obsoleted == false)
Cache.MarkInstall(I,false);
}
/* Auto upgrade all installed packages, this provides the basis
for the installation */
for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)