diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2010-09-15 19:56:50 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2010-09-15 19:56:50 +0200 |
| commit | 3b3a681c79d3e5c32fcd6ccb87e74e5ca6e234b4 (patch) | |
| tree | 325ff730ac56ff7313f4044d2406f47600d27b35 /apt-pkg/depcache.cc | |
| parent | 8877870768f3525ae72dc13a438100e90260f4e2 (diff) | |
| parent | 58d9e6e0f9bf93724637c8a5687fe22058fc75a1 (diff) | |
merged lp:~donkult/apt/sid
Diffstat (limited to 'apt-pkg/depcache.cc')
| -rw-r--r-- | apt-pkg/depcache.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 018b05e65..d893c42d7 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1615,7 +1615,8 @@ pkgCache::VerIterator pkgDepCache::Policy::GetCandidateVer(PkgIterator const &Pk /* Stash the highest version of a not-automatic source, we use it if there is nothing better */ - if ((J.File()->Flags & Flag::NotAutomatic) != 0) + if ((J.File()->Flags & Flag::NotAutomatic) != 0 || + (J.File()->Flags & Flag::ButAutomaticUpgrades) != 0) { if (Last.end() == true) Last = I; |