diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2010-09-04 10:46:36 +0200 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2010-09-04 10:46:36 +0200 |
| commit | 1dc03a8614454023ab8ed265465c061980cb9ea9 (patch) | |
| tree | fc09a68a772d90a46d8d1fb0abee6d18ffee3cad | |
| parent | 223b069806ea822e3fca2f5448108a7716ed7d98 (diff) | |
* apt-pkg/indexcopy.cc:
- support really still the APT::GPGV::TrustedKeyring setting,
as it breaks d-i badly otherwise (Closes: #595428)
| -rw-r--r-- | apt-pkg/indexcopy.cc | 2 | ||||
| -rw-r--r-- | apt-pkg/init.cc | 3 | ||||
| -rw-r--r-- | debian/changelog | 5 |
3 files changed, 6 insertions, 4 deletions
diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc index a2a1d5934..ed037027c 100644 --- a/apt-pkg/indexcopy.cc +++ b/apt-pkg/indexcopy.cc @@ -661,7 +661,7 @@ bool SigVerify::RunGPGV(std::string const &File, std::string const &FileGPG, { string const gpgvpath = _config->Find("Dir::Bin::gpg", "/usr/bin/gpgv"); // FIXME: remove support for deprecated APT::GPGV setting - string const trustedFile = _config->FindFile("Dir::Etc::Trusted"); + string const trustedFile = _config->Find("APT::GPGV::TrustedKeyring", _config->FindFile("Dir::Etc::Trusted")); string const trustedPath = _config->FindDir("Dir::Etc::TrustedParts"); bool const Debug = _config->FindB("Debug::Acquire::gpgv", false); 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"); diff --git a/debian/changelog b/debian/changelog index bed6a55c7..205777a01 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,11 @@ apt (0.8.2) UNRELEASED; urgency=low * apt-pkg/deb/dpkgpm.cc: - create Dir::Log if needed to support /var/log as tmpfs or similar, inspired by Thomas Bechtold, thanks! (Closes: #523919, LP: #220239) + * apt-pkg/indexcopy.cc: + - support really still the APT::GPGV::TrustedKeyring setting, + as it breaks d-i badly otherwise (Closes: #595428) - -- David Kalnischkies <kalnischkies@gmail.com> Fri, 03 Sep 2010 19:29:01 +0200 + -- David Kalnischkies <kalnischkies@gmail.com> Sat, 04 Sep 2010 10:45:45 +0200 apt (0.8.1) unstable; urgency=low |