diff options
| author | Julian Andres Klode <jak@debian.org> | 2025-01-21 11:16:48 +0000 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2025-01-21 11:16:48 +0000 |
| commit | a3a4896b0bbc4567a07c6fb7cfaa8a1f6b03fab3 (patch) | |
| tree | 3a6febf5d378e2f323cb1a461a76604efe0c8a59 /apt-pkg | |
| parent | afeaf6a442bb2603a1ebce096586cef48d065ba4 (diff) | |
| parent | 6f618323d2d1cea47df0952a9ed2cebcda6c7193 (diff) | |
Merge branch 'trust-deprecation' into 'main'
Warn about missing Signed-By in .list format
See merge request apt-team/apt!431
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/contrib/gpgv.cc | 4 | ||||
| -rw-r--r-- | apt-pkg/init.cc | 1 |
2 files changed, 2 insertions, 3 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) diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc index d71d9541f..d56973eeb 100644 --- a/apt-pkg/init.cc +++ b/apt-pkg/init.cc @@ -159,7 +159,6 @@ bool pkgInitConfig(Configuration &Cnf) Cnf.CndSet("Dir::Etc::parts","apt.conf.d"); Cnf.CndSet("Dir::Etc::preferences","preferences"); Cnf.CndSet("Dir::Etc::preferencesparts","preferences.d"); - Cnf.CndSet("Dir::Etc::trusted", "trusted.gpg"); Cnf.CndSet("Dir::Etc::trustedparts","trusted.gpg.d"); Cnf.CndSet("Dir::Bin::methods", LIBEXEC_DIR "/methods"); Cnf.CndSet("Dir::Bin::solvers::",LIBEXEC_DIR "/solvers"); |