diff options
| author | Michael Vogt <mvo@debian.org> | 2010-09-06 18:11:49 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2010-09-06 18:11:49 +0200 |
| commit | fb031c5598c529b98477c47eac6fe11cae4b1b66 (patch) | |
| tree | de7908c98e8086a148c423e6edb3d8a6e7455491 /apt-pkg/init.cc | |
| parent | eb1115ef4e84b90189a50c15af4002e4e7306c01 (diff) | |
| parent | 7753e4684e2b80abbed296b90f47be12b4fce8fc (diff) | |
merged from lp:~donkult/apt/sid
Diffstat (limited to 'apt-pkg/init.cc')
| -rw-r--r-- | apt-pkg/init.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc index 846b27313..f0bad78df 100644 --- a/apt-pkg/init.cc +++ b/apt-pkg/init.cc @@ -70,8 +70,7 @@ bool pkgInitConfig(Configuration &Cnf) Cnf.Set("Dir::Etc::parts","apt.conf.d"); Cnf.Set("Dir::Etc::preferences","preferences"); Cnf.Set("Dir::Etc::preferencesparts","preferences.d"); - string const deprecated = _config->Find("APT::GPGV::TrustedKeyring"); - Cnf.Set("Dir::Etc::trusted", deprecated.empty() ? "trusted.gpg" : deprecated); + Cnf.Set("Dir::Etc::trusted", "trusted.gpg"); Cnf.Set("Dir::Etc::trustedparts","trusted.gpg.d"); Cnf.Set("Dir::Bin::methods","/usr/lib/apt/methods"); Cnf.Set("Dir::Media::MountPath","/media/apt"); |