diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2010-09-07 09:32:51 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2010-09-07 09:32:51 +0200 |
| commit | 3580e481e0dcbb4a39d687137eafcda60d8e85d5 (patch) | |
| tree | cacd09d1c987a06d6e02581eb8c3afaf1e56ec00 /apt-pkg/init.cc | |
| parent | debca0004bc8b57e487a5a8ffdec51b54ae2f22a (diff) | |
| parent | ca07950ec545b41a18cbeff0ec0ba43624592c07 (diff) | |
merged from the debian-sid branch
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 07bbe7061..e031cbb94 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"); |