summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-08-24 12:16:17 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-08-24 12:16:17 -0400
commit1f83dafc7e9be3e06362dcb3009b42c940d6057c (patch)
tree544fdfaa1e4262e13558952dd02a5dff17eaac18
parentcea55b70fc26911d41ed66da62e203def37e32bf (diff)
Bugfix: Fix fsck in SHA*E backends, when the key contains composite extensions, as added in 3.20120721.
-rw-r--r--Backend/SHA.hs2
-rw-r--r--debian/changelog2
2 files changed, 3 insertions, 1 deletions
diff --git a/Backend/SHA.hs b/Backend/SHA.hs
index bb400a768..8f7dbe774 100644
--- a/Backend/SHA.hs
+++ b/Backend/SHA.hs
@@ -127,5 +127,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 ef3c21cf7..9f62d38da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ git-annex (3.20120808) UNRELEASED; urgency=low
* Pass --use-agent to gpg when in no tty mode. Thanks, Eskild Hustvedt.
* init: If no description is provided for a new repository, one will
automatically be generated, like "joey@gnu:~/foo"
+ * Bugfix: Fix fsck in SHA*E backends, when the key contains composite
+ extensions, as added in 3.20120721.
-- Joey Hess <joeyh@debian.org> Thu, 09 Aug 2012 13:51:47 -0400