From b985e0b7ec0e5ba23e0d36c4bcab0d1760e25676 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 24 Aug 2012 12:16:17 -0400 Subject: [PATCH] Bugfix: Fix fsck in SHA*E backends, when the key contains composite extensions, as added in 3.20120721. --- Backend/SHA.hs | 2 +- debian/changelog | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Backend/SHA.hs b/Backend/SHA.hs index cf61139e00..3ac1463ad0 100644 --- a/Backend/SHA.hs +++ b/Backend/SHA.hs @@ -125,5 +125,5 @@ checkKeyChecksum size key file = do _ -> return True where check s - | s == dropExtension (keyName key) = True + | s == dropExtensions (keyName key) = True | otherwise = False diff --git a/debian/changelog b/debian/changelog index d81d1661d1..2a3ecc6044 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ git-annex (3.20120808) UNRELEASED; urgency=low * S3: Add fileprefix setting. * Pass --use-agent to gpg when in no tty mode. Thanks, Eskild Hustvedt. + * Bugfix: Fix fsck in SHA*E backends, when the key contains composite + extensions, as added in 3.20120721. -- Joey Hess Thu, 09 Aug 2012 13:51:47 -0400