summaryrefslogtreecommitdiff
path: root/apt-pkg/deb/deblistparser.cc
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2010-09-14 18:57:46 +0200
committerDavid Kalnischkies <kalnischkies@gmail.com>2010-09-14 18:57:46 +0200
commit5ed56f934dd204cc3a1d757ccf5eac23f8374736 (patch)
treeef9bc81beb82db782ade3d44837673a9c1f3e11d /apt-pkg/deb/deblistparser.cc
parent6874a1a88255fe0ab1b501961ce1fec26ee718a7 (diff)
* apt-pkg/policy.cc:
- support 100-pinning in Release file with ButAutomaticUpgrades as requested by the backports crew (Closes: #596097) * apt-pkg/deb/deblistparser.cc: - overrule NotAutomatic in case of ButAutomaticUpgrades
Diffstat (limited to 'apt-pkg/deb/deblistparser.cc')
-rw-r--r--apt-pkg/deb/deblistparser.cc6
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();
}