diff options
| author | Michael Vogt <egon@debian-devbox> | 2013-04-02 15:20:16 +0200 |
|---|---|---|
| committer | Michael Vogt <egon@debian-devbox> | 2013-04-02 15:20:16 +0200 |
| commit | c1b21367668fb435cfb8a2a18c3292e006c2e795 (patch) | |
| tree | 3c2afcfa7b6857eb90cc230b1f00cf3b737e07e7 /apt-pkg/deb/debindexfile.cc | |
| parent | bc65130d13c2737aefb85e609f67be196ae10a7f (diff) | |
| parent | cfe9dc32900b537986c6765972307fd9e57ece0b (diff) | |
merged lp:~mvo/apt/fix-inrelease5
Diffstat (limited to 'apt-pkg/deb/debindexfile.cc')
| -rw-r--r-- | apt-pkg/deb/debindexfile.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc index de645bb6e..909dfcf47 100644 --- a/apt-pkg/deb/debindexfile.cc +++ b/apt-pkg/deb/debindexfile.cc @@ -22,6 +22,7 @@ #include <apt-pkg/strutl.h> #include <apt-pkg/acquire-item.h> #include <apt-pkg/debmetaindex.h> +#include <apt-pkg/gpgv.h> #include <sys/stat.h> /*}}}*/ @@ -337,7 +338,12 @@ bool debPackagesIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const if (releaseExists == true || FileExists(ReleaseFile) == true) { - FileFd Rel(ReleaseFile,FileFd::ReadOnly); + FileFd Rel; + // Beware: The 'Release' file might be clearsigned in case the + // signature for an 'InRelease' file couldn't be checked + if (OpenMaybeClearSignedFile(ReleaseFile, Rel) == false) + return false; + if (_error->PendingError() == true) return false; Parser.LoadReleaseInfo(File,Rel,Section); |