diff options
| author | Julian Andres Klode <jak@debian.org> | 2025-01-22 09:17:23 +0000 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2025-01-22 09:17:23 +0000 |
| commit | 0c07c8f38e320e8f8b303011813018f8f02beed8 (patch) | |
| tree | 9414ac9ba3395e04a55c1ebb99405f36e48ed500 /apt-pkg | |
| parent | 61f8f40f921cde13c5b97abbdf900646745e8e30 (diff) | |
| parent | 09c76cb29b61e1d523a30287f8a9bf0cb0b608e7 (diff) | |
Merge branch 'no-fail-missing-parts' into 'main'
sqv, gpgv: Do not fail if Dir::Etc::Trusted is set and trusted.gpg.d is missing
See merge request apt-team/apt!433
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/contrib/gpgv.cc | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/apt-pkg/contrib/gpgv.cc b/apt-pkg/contrib/gpgv.cc index 173bfdf22..c6eabc690 100644 --- a/apt-pkg/contrib/gpgv.cc +++ b/apt-pkg/contrib/gpgv.cc @@ -395,12 +395,20 @@ void ExecGPGV(std::string const &File, std::string const &FileGPG, } } - std::vector<std::string> Parts; if (not FoundKeyring) { - Parts = GetListOfFilesInDir(_config->FindDir("Dir::Etc::TrustedParts"), std::vector<std::string>{"gpg", "asc"}, true); + // Either trusted or trustedparts must exist + _error->PushToStack(); + auto Parts = GetListOfFilesInDir(_config->FindDir("Dir::Etc::TrustedParts"), std::vector<std::string>{"gpg", "asc"}, true); if (auto trusted = _config->FindFile("Dir::Etc::Trusted"); not trusted.empty()) + { + apt_warning(std::cerr, statusfd, fd, "Loading %s from deprecated option Dir::Etc::Trusted\n", trusted.c_str()); Parts.push_back(trusted); + } + if (Parts.empty()) + _error->MergeWithStack(); + else + _error->RevertToStack(); for (auto &Part : Parts) { if (Debug) |