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/indexcopy.cc | |
| parent | eb1115ef4e84b90189a50c15af4002e4e7306c01 (diff) | |
| parent | 7753e4684e2b80abbed296b90f47be12b4fce8fc (diff) | |
merged from lp:~donkult/apt/sid
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 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); |