diff options
author | Michael Vogt <michael.vogt@ubuntu.com> | 2010-12-07 16:19:48 +0100 |
---|---|---|
committer | Michael Vogt <michael.vogt@ubuntu.com> | 2010-12-07 16:19:48 +0100 |
commit | ff5037a07efcda5eabb453582c71586475c34b86 (patch) | |
tree | 196c795e7459dc0e1e4ad2ee1b363be845e912c5 /apt-pkg | |
parent | 47fea97bf8da8695ef0f998ef3b68a0bb0207133 (diff) | |
parent | f23fc0e0903c9fdf3f57a2c46d1f57abb4655e5c (diff) |
merged from debian-sid
Diffstat (limited to 'apt-pkg')
-rw-r--r-- | apt-pkg/algorithms.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index 9abb7a947..0fbce3c2a 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -374,6 +374,13 @@ bool pkgDistUpgrade(pkgDepCache &Cache) { pkgDepCache::ActionGroup group(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) + if (I->CurrentVer != 0) + Cache.MarkInstall(I, false, 0, false); + /* Auto upgrade all installed packages, this provides the basis for the installation */ for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++) |