diff options
| author | Matt Zimmerman <matt.zimmerman@canonical.com> | 2005-02-26 23:22:32 +0000 |
|---|---|---|
| committer | Matt Zimmerman <matt.zimmerman@canonical.com> | 2005-02-26 23:22:32 +0000 |
| commit | f827a9e553ac84e70cba573b071e6a1891ec40d5 (patch) | |
| tree | f90f98f49affd55d635d9ea729f6dbc3aaa7e754 /methods | |
| parent | af45f087e2a08534d1df8ec481d2688d0fbafe7b (diff) | |
| parent | 872b3d3983839d2d9f14268c5adf976a72ecc5ad (diff) | |
Merge apt--mvo--0
Patches applied:
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-2
* merge with matts tree, added documentation for the gpgv stuff
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-3
* added gpgv::Options to configure-index
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-4
* PulseIntervall can be configured now to make frontends like synaptic hayppy. it's done in a way that does not break binary compatibility
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-5
* fix for apt-get update removing the cdroms Release.gpg files
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-6
* path scoring changed, the non-symlink path is scored highest
Diffstat (limited to 'methods')
| -rw-r--r-- | methods/cdrom.cc | 2 | ||||
| -rw-r--r-- | methods/gpgv.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/methods/cdrom.cc b/methods/cdrom.cc index d5987dc45..d8bb9522e 100644 --- a/methods/cdrom.cc +++ b/methods/cdrom.cc @@ -97,7 +97,7 @@ bool CDROMMethod::Fetch(FetchItem *Itm) { Res.LastModified = Itm->LastModified; Res.IMSHit = true; - Res.Filename = File; + Res.Filename = Itm->DestFile; URIDone(Res); return true; } diff --git a/methods/gpgv.cc b/methods/gpgv.cc index 40c072b2b..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; |