summaryrefslogtreecommitdiff
path: root/apt-pkg
diff options
context:
space:
mode:
authorJulian Andres Klode <julian.klode@canonical.com>2025-01-20 13:08:06 +0100
committerJulian Andres Klode <jak@debian.org>2025-01-21 11:16:34 +0000
commit6f618323d2d1cea47df0952a9ed2cebcda6c7193 (patch)
tree3a6febf5d378e2f323cb1a461a76604efe0c8a59 /apt-pkg
parente14417db27771ad85f45880974c8f59f05d138f1 (diff)
Unset Dir::Etc::trusted
The trusted.gpg file has been deprecated since February 2022 and can no longer be managed easily without apt-key, so we should not be falling back to it by default. We do not remove the actual code to fall back to it, such that code that passes Dir::Etc::trusted explicitly continues to work for the time being (with the warnings in update), as the overhead is now rather trivial.
Diffstat (limited to 'apt-pkg')
-rw-r--r--apt-pkg/init.cc1
1 files changed, 0 insertions, 1 deletions
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");