diff options
author | Michael Vogt <michael.vogt@ubuntu.com> | 2013-03-26 14:54:31 +0100 |
---|---|---|
committer | Michael Vogt <michael.vogt@ubuntu.com> | 2013-03-26 14:54:31 +0100 |
commit | cfe9dc32900b537986c6765972307fd9e57ece0b (patch) | |
tree | d5ad7114da5ebb0c4620b3a2711e045a9268a9fb /apt-pkg/indexrecords.cc | |
parent | 55971004215609a02ca19c59bd058da20729ba11 (diff) | |
parent | cb32348956441e33733e6bd8c2c572f19600dc25 (diff) |
merge stuff from donkult
Diffstat (limited to 'apt-pkg/indexrecords.cc')
-rw-r--r-- | apt-pkg/indexrecords.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/apt-pkg/indexrecords.cc b/apt-pkg/indexrecords.cc index af2639beb..1461a24bb 100644 --- a/apt-pkg/indexrecords.cc +++ b/apt-pkg/indexrecords.cc @@ -12,6 +12,7 @@ #include <apt-pkg/configuration.h> #include <apt-pkg/fileutl.h> #include <apt-pkg/hashes.h> +#include <apt-pkg/gpgv.h> #include <sys/stat.h> #include <clocale> @@ -57,7 +58,10 @@ bool indexRecords::Exists(string const &MetaKey) const bool indexRecords::Load(const string Filename) /*{{{*/ { - FileFd Fd(Filename, FileFd::ReadOnly); + FileFd Fd; + if (OpenMaybeClearSignedFile(Filename, Fd) == false) + return false; + pkgTagFile TagFile(&Fd, Fd.Size() + 256); // XXX if (_error->PendingError() == true) { |