diff options
author | Julian Andres Klode <julian.klode@canonical.com> | 2018-12-18 14:50:25 +0100 |
---|---|---|
committer | Julian Andres Klode <julian.klode@canonical.com> | 2019-02-05 13:33:54 +0100 |
commit | f52e7a2040f461fb37f88751f5a42a5d5c130441 (patch) | |
tree | c51d3aa2123ef63fcac038272adc73b09d2095a4 /apt-pkg | |
parent | 97412ac47a974b1eb0e8280cf11b3b80ff1ba17f (diff) |
Introduce experimental 'never' pinning for sources
This allows disabling a repository by pinning it to 'never',
which is internally translated to a value of -32768 (or whatever
the minimum of short is).
This overrides any other pin for that repository. It can be used
to make sure certain sources are never used; for example, in
unattended-upgrades.
To prevent semantic changes to existing files, we substitute
min + 1 for every pin-priority: <min>. This is a temporary
solution, as we are waiting for an ABI break.
To add pins with that value, the special Pin-Priority
"never" may be used for now. It's unclear if that will
persist, or if the interface will change eventually.
(cherry picked from commit 8bb2a91a070170d7d8e71206d1c66a26809bdbc3)
LP: #1814727
Diffstat (limited to 'apt-pkg')
-rw-r--r-- | apt-pkg/policy.cc | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc index d7eb43c0f..6de439d32 100644 --- a/apt-pkg/policy.cc +++ b/apt-pkg/policy.cc @@ -38,6 +38,8 @@ using namespace std; +constexpr short NEVER_PIN = std::numeric_limits<short>::min(); + // Policy::Init - Startup and bind to a cache /*{{{*/ // --------------------------------------------------------------------- /* Set the defaults for operation. The default mode with no loaded policy @@ -107,7 +109,7 @@ bool pkgPolicy::InitDefaults() pkgVersionMatch Match(I->Data,I->Type); for (pkgCache::PkgFileIterator F = Cache->FileBegin(); F != Cache->FileEnd(); ++F) { - if (Fixed[F->ID] == false && Match.FileMatch(F) == true) + if ((Fixed[F->ID] == false || I->Priority == NEVER_PIN) && PFPriority[F->ID] != NEVER_PIN && Match.FileMatch(F) == true) { PFPriority[F->ID] = I->Priority; @@ -271,7 +273,14 @@ APT_PURE signed short pkgPolicy::GetPriority(pkgCache::PkgIterator const &Pkg) APT_PURE signed short pkgPolicy::GetPriority(pkgCache::VerIterator const &Ver, bool ConsiderFiles) { if (VerPins[Ver->ID].Type != pkgVersionMatch::None) - return VerPins[Ver->ID].Priority; + { + // If all sources are never pins, the never pin wins. + if (VerPins[Ver->ID].Priority == NEVER_PIN) + return NEVER_PIN; + for (pkgCache::VerFileIterator file = Ver.FileList(); file.end() == false; file++) + if (GetPriority(file.File()) != NEVER_PIN) + return VerPins[Ver->ID].Priority; + } if (!ConsiderFiles) return 0; @@ -388,9 +397,17 @@ bool ReadPinFile(pkgPolicy &Plcy,string File) for (; Word != End && isspace(*Word) != 0; Word++); _error->PushToStack(); - int const priority = Tags.FindI("Pin-Priority", 0); + std::string sPriority = Tags.FindS("Pin-Priority"); + int priority = sPriority == "never" ? NEVER_PIN : Tags.FindI("Pin-Priority", 0); bool const newError = _error->PendingError(); _error->MergeWithStack(); + + if (sPriority == "never" && not Name.empty()) + return _error->Error(_("%s: The special 'Pin-Priority: %s' can only be used for 'Package: *' records"), File.c_str(), "never"); + + // Silently clamp the never pin to never pin + 1 + if (priority == NEVER_PIN && sPriority != "never") + priority = NEVER_PIN + 1; if (priority < std::numeric_limits<short>::min() || priority > std::numeric_limits<short>::max() || newError) { |