summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2014-08-02 05:09:13 +0200
committerMichael Vogt <mvo@debian.org>2014-08-02 05:09:13 +0200
commite84d3803ed3bdd55e20e3720b375769330966fa0 (patch)
tree9c27918d2766c31103d8e0c5ddc0931f8c9ae01a
parent63d0f85391839a666957add1833e67f7638c8a83 (diff)
move clearsign check into pkgAcqMetaClearSig::Failed()
-rw-r--r--apt-pkg/acquire-item.cc23
1 files changed, 11 insertions, 12 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index a6f69944e..bf6866f17 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -1551,18 +1551,6 @@ void pkgAcqMetaIndex::Done(string Message,unsigned long long Size,HashStringList
}
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))
@@ -1985,6 +1973,17 @@ void pkgAcqMetaClearSig::Failed(string Message,pkgAcquire::MethodConfig *Cnf) /*
// we failed, we will not get additional items from this method
ExpectedAdditionalItems = 0;
+ // 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 (!StartsWithGPGClearTextSignature(DestFile))
+ {
+ //_error->Error(_("Does not start with a clear sign signature"));
+ pkgAcquire::Item::Failed(Message, Cnf);
+ return;
+ }
+
+
if (AuthPass == false)
{
// Queue the 'old' InRelease file for removal if we try Release.gpg