diff options
author | Michael Vogt <michael.vogt@ubuntu.com> | 2005-02-09 12:02:18 +0000 |
---|---|---|
committer | Michael Vogt <michael.vogt@ubuntu.com> | 2005-02-09 12:02:18 +0000 |
commit | 8a3642bdee1506ba77e3a6051aa498950a2e151f (patch) | |
tree | 2dc650ab66ff98b42d36d416bedc2136654b92bf /methods | |
parent | ec048f63365407f01766ef218165280cee805f1a (diff) | |
parent | af45f087e2a08534d1df8ec481d2688d0fbafe7b (diff) |
* merge with matts tree, added documentation for the gpgv stuff
Patches applied:
* apt@packages.debian.org/apt--main--0--patch-59
Open 0.6.32
* apt@packages.debian.org/apt--main--0--patch-60
Merge apt--mvo--0
* apt@packages.debian.org/apt--main--0--patch-61
Add missing whitespace in new Debug::Acquire::gpgv output
Diffstat (limited to 'methods')
-rw-r--r-- | methods/gpgv.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/methods/gpgv.cc b/methods/gpgv.cc index f7d16ef01..24e945b2c 100644 --- a/methods/gpgv.cc +++ b/methods/gpgv.cc @@ -46,7 +46,7 @@ const char *GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, int status; struct stat buff; string gpgvpath = _config->Find("Dir::Bin::gpg", "/usr/bin/gpgv"); - string pubringpath = _config->Find("Apt::GPGV::TrustedKeyring", "/etc/apt/trusted.gpg"); + string pubringpath = _config->Find("APT::GPGV::TrustedKeyring", "/etc/apt/trusted.gpg"); if (_config->FindB("Debug::Acquire::gpgv", false)) { std::cerr << "gpgv path: " << gpgvpath << std::endl; @@ -101,7 +101,7 @@ const char *GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, { std::cerr << "Preparing to exec: " << gpgvpath; for(unsigned int j=0;Args[j] != NULL; j++) - std::cerr << Args[j] << " "; + std::cerr << " " << Args[j]; std::cerr << std::endl; } int nullfd = open("/dev/null", O_RDONLY); |