diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2013-04-23 08:08:54 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2013-04-23 08:08:54 +0200 |
| commit | 3444603f5ff2b4c4816e45e686e06e01df31cdc4 (patch) | |
| tree | b0e63e9bc86ca6d39f6987381ca7bfa64e186048 /apt-pkg/indexrecords.cc | |
| parent | 52d5690b47bd4efe425fa23d9f6559bb44324cd1 (diff) | |
| parent | 3278fe66567d149ea92c1afa78941f2bc3c71c85 (diff) | |
merged debian-sid branch and resolved conflicts
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 649b6059d..e37a78cfb 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) { |