summaryrefslogtreecommitdiff
path: root/apt-pkg/acquire-item.cc
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2012-07-10 15:19:09 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2012-07-10 15:19:09 +0200
commitfe5804fc5010dd8f2e9406187bfc1f6afeb29c5a (patch)
tree8df5aed996e0eda63452bdbe1ba5ac42ac5a8fb6 /apt-pkg/acquire-item.cc
parent1c89c98a56df709b4c4477bbd7b86f4e32cee214 (diff)
cherry pick -r1847 from bzr+ssh://bazaar.launchpad.net/~mvo/apt/lp346386/
Diffstat (limited to 'apt-pkg/acquire-item.cc')
-rw-r--r--apt-pkg/acquire-item.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index ddd3300f9..665dd427e 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -1241,8 +1241,7 @@ void pkgAcqMetaIndex::Done(string Message,unsigned long long Size,string Hash, /
// 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 &&
- !IsPgpClearTextSignature(DestFile))
+ if (SigFile == DestFile && !StartsWithGPGClearTextSignature(DestFile))
{
Failed(Message, Cfg);
return;