diff options
author | Michael Vogt <mvo@debian.org> | 2013-07-10 16:38:55 +0200 |
---|---|---|
committer | Michael Vogt <mvo@debian.org> | 2013-07-10 16:38:55 +0200 |
commit | d2636e63fd823e537f61b5e9d33a85aa0626f0aa (patch) | |
tree | 1041902cfd6820605314424f239b27c18ae4ef2b /apt-pkg/acquire-item.cc | |
parent | 88f5f8258f0d6f9d3a188ccf8a89f36243ea14b5 (diff) |
remove more merge artifacts
Diffstat (limited to 'apt-pkg/acquire-item.cc')
-rw-r--r-- | apt-pkg/acquire-item.cc | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 46e4a7065..c48443eff 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -1235,20 +1235,9 @@ void pkgAcqMetaIndex::Done(string Message,unsigned long long Size,string Hash, / } else { - // FIXME: move this into pkgAcqMetaClearSig::Done on the next - // ABI break - - // if we expect a ClearTextSignature (InRelase), ensure that - // this is what we get and if not fail to queue a - // Release/Release.gpg, see #346386 - if (SigFile == DestFile && !StartsWithGPGClearTextSignature(DestFile)) - { - Failed(Message, Cfg); - return; - } - // There was a signature file, so pass it to gpgv for // verification + if (_config->FindB("Debug::pkgAcquire::Auth", false)) std::cerr << "Metaindex acquired, queueing gpg verification (" << SigFile << "," << DestFile << ")\n"; |