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/deb/deblistparser.cc | |
| parent | 8877870768f3525ae72dc13a438100e90260f4e2 (diff) | |
| parent | 58d9e6e0f9bf93724637c8a5687fe22058fc75a1 (diff) | |
merged lp:~donkult/apt/sid
Diffstat (limited to 'apt-pkg/deb/deblistparser.cc')
| -rw-r--r-- | apt-pkg/deb/deblistparser.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 5fb737970..da8b0271b 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -815,6 +815,12 @@ bool debListParser::LoadReleaseInfo(pkgCache::PkgFileIterator &FileI, if (Section.FindFlag("NotAutomatic",FileI->Flags, pkgCache::Flag::NotAutomatic) == false) _error->Warning("Bad NotAutomatic flag"); + if (Section.FindFlag("ButAutomaticUpgrades",FileI->Flags, + pkgCache::Flag::ButAutomaticUpgrades) == false) + _error->Warning("Bad ButAutomaticUpgrades flag"); + // overrule the NotAutomatic setting if needed as they are both present for compatibility + else if ((FileI->Flags & pkgCache::Flag::ButAutomaticUpgrades) == pkgCache::Flag::ButAutomaticUpgrades) + FileI->Flags &= ~pkgCache::Flag::NotAutomatic; return !_error->PendingError(); } |