diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2010-08-24 21:44:11 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2010-08-24 21:44:11 +0200 |
| commit | 17ea77d3332ce3abbbc96a9e110a37ae055ac422 (patch) | |
| tree | 611708d199721f5bca0ea4826d03da0016f3780d /apt-pkg/indexcopy.cc | |
| parent | 7e32e3e58d5499056b17acd0a9992704e3f55951 (diff) | |
| parent | 39ee79d5b84390ae79d8cce9389c1541bcd68a25 (diff) | |
* merged from debian/unstable
* merge of the debian-expermental-ma branch
* refresh po/pot files in doc/ and po/
* Fix spelling error in cmdline/apt-get.cc. Thanks to Osamu Aoki
Closes: #594211
* Swedish (Daniel Nylander). Closes: #592366
* French (Christian Perrier)
* Thai (Theppitak Karoonboonyanan). Closes: #592695
* Russian (Yuri Kozlov). Closes: #594232
* French (Christian Perrier)
* apt-pkg/contrib/strutl.cc:
- fix error checking for vsnprintf in its safe variant
* methods/bzip2.cc:
- fix error checking for read in case of failing bzip2/lzma/whatever
* debian/apt.cron.daily:
- create backups for our extended_states file (Closes: #593430)
* apt-pkg/init.cc:
- set the default values for dir::etc::trusted options correctly
* ftparchive/writer.cc:
- init valid-until correctly to prevent garbage entering Release file
* apt-pkg/deb/debsystem.cc:
- set dir::state::status based at least on dir
* apt-pkg/deb/dpkgpm.cc:
- use the InstVer instead of the CurrentVer for the autobit transfer
* methods/http.cc:
- some http servers violate HTTP1.1 by not issuing a Reason-Phrase
(or at least a space after the code) especially for 200, but lets
be nice and ignore it as we don't need the reason in general
* apt-pkg/acquire-item.cc:
- don't use ReadOnlyGzip mode for PDiffs as this mode doesn't work
in combination with the AddFd methods of our hashclasses
Diffstat (limited to 'apt-pkg/indexcopy.cc')
| -rw-r--r-- | apt-pkg/indexcopy.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc index b4e587d7b..a2a1d5934 100644 --- a/apt-pkg/indexcopy.cc +++ b/apt-pkg/indexcopy.cc @@ -661,9 +661,8 @@ 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", - _config->Find("APT::GPGV::TrustedKeyring", "/etc/apt/trusted.gpg").c_str()); - string const trustedPath = _config->FindDir("Dir::Etc::TrustedParts", "/etc/apt/trusted.gpg.d"); + string const trustedFile = _config->FindFile("Dir::Etc::Trusted"); + string const trustedPath = _config->FindDir("Dir::Etc::TrustedParts"); bool const Debug = _config->FindB("Debug::Acquire::gpgv", false); |