summaryrefslogtreecommitdiff
path: root/apt-pkg/indexrecords.cc
diff options
context:
space:
mode:
authorMichael Vogt <egon@debian-devbox>2013-04-02 15:20:16 +0200
committerMichael Vogt <egon@debian-devbox>2013-04-02 15:20:16 +0200
commitc1b21367668fb435cfb8a2a18c3292e006c2e795 (patch)
tree3c2afcfa7b6857eb90cc230b1f00cf3b737e07e7 /apt-pkg/indexrecords.cc
parentbc65130d13c2737aefb85e609f67be196ae10a7f (diff)
parentcfe9dc32900b537986c6765972307fd9e57ece0b (diff)
merged lp:~mvo/apt/fix-inrelease5
Diffstat (limited to 'apt-pkg/indexrecords.cc')
-rw-r--r--apt-pkg/indexrecords.cc6
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)
{