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 /apt-pkg/indexcopy.cc | |
| parent | 223b069806ea822e3fca2f5448108a7716ed7d98 (diff) | |
| download | apt-1dc03a8614454023ab8ed265465c061980cb9ea9.tar.gz | |
* apt-pkg/indexcopy.cc:
- support really still the APT::GPGV::TrustedKeyring setting,
as it breaks d-i badly otherwise (Closes: #595428)
Diffstat (limited to 'apt-pkg/indexcopy.cc')
| -rw-r--r-- | apt-pkg/indexcopy.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc index a2a1d593..ed037027 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); |