diff options
| author | Julian Andres Klode <julian.klode@canonical.com> | 2025-01-20 12:31:55 +0100 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2025-01-21 11:16:34 +0000 |
| commit | e14417db27771ad85f45880974c8f59f05d138f1 (patch) | |
| tree | 89dc3ca0cf51829dbf30f96ee5bff60c29759cf0 /apt-pkg | |
| parent | c4e57e200ae40db5e9ada6ec0933b53d249e4a97 (diff) | |
Remove superseded warning about trusted.gpg fallback
This warning has been superseded by the missing sources.list
notice (which will also become a warning shortly)
Adjust the sqv exit to avoid introducing a new spurious
"No good signature" that we did not reach before.
moo
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/contrib/gpgv.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apt-pkg/contrib/gpgv.cc b/apt-pkg/contrib/gpgv.cc index 237ddc856..173bfdf22 100644 --- a/apt-pkg/contrib/gpgv.cc +++ b/apt-pkg/contrib/gpgv.cc @@ -399,8 +399,8 @@ void ExecGPGV(std::string const &File, std::string const &FileGPG, if (not FoundKeyring) { Parts = GetListOfFilesInDir(_config->FindDir("Dir::Etc::TrustedParts"), std::vector<std::string>{"gpg", "asc"}, true); - if (char *env = getenv("APT_KEY_NO_LEGACY_KEYRING"); env == nullptr || not StringToBool(env, false)) - Parts.insert(Parts.begin(), _config->FindFile("Dir::Etc::Trusted")); + if (auto trusted = _config->FindFile("Dir::Etc::Trusted"); not trusted.empty()) + Parts.push_back(trusted); for (auto &Part : Parts) { if (Debug) |