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:17:21 -0400
commitb985e0b7ec0e5ba23e0d36c4bcab0d1760e25676 (patch)
tree95cbec71b49b5da0a2efa627cadc5fc6e10095eb
parent8f4870c7b66e011988ef4ac58a3121af5018ca31 (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 cf61139e0..3ac1463ad 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 d81d1661d..2a3ecc604 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 <joeyh@debian.org> Thu, 09 Aug 2012 13:51:47 -0400