diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2010-10-14 14:49:47 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2010-10-14 14:49:47 +0200 |
| commit | 58d0598ad6f1c514bf7d89fdea676a697f0d9388 (patch) | |
| tree | eade3a15056c5dd70ac0da1953186065c7441c7b /apt-pkg/depcache.cc | |
| parent | 2c53e7d1a82e2bfe44151ac9d1ac2043fca09efa (diff) | |
| parent | 44dc669e08353716da835608ea54563b4c8c32bb (diff) | |
merged from the debian-sid branch
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 d3e45f76b..22043db08 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1629,7 +1629,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; |