summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-06-10 11:43:28 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-06-10 11:43:28 -0400
commit9a272815ddd33272008a4052ea74e7bbc4c842f8 (patch)
tree60ee20c1826133c1fe9c774fac5a78ea21ecd8d3
parent90dd245522ccffee0e77eba3b79e32d6029977fc (diff)
Bugfix: Fix fsck to not think all SHAnE keys are bad.
-rw-r--r--Backend/SHA.hs2
-rw-r--r--debian/changelog1
2 files changed, 2 insertions, 1 deletions
diff --git a/Backend/SHA.hs b/Backend/SHA.hs
index 94ebe093e..8ed00b707 100644
--- a/Backend/SHA.hs
+++ b/Backend/SHA.hs
@@ -119,7 +119,7 @@ checkKeyChecksum size key = do
then return True
else do
s <- shaN size file
- if s == keyName key
+ if s == dropExtension (keyName key)
then return True
else do
dest <- moveBad key
diff --git a/debian/changelog b/debian/changelog
index 4fe1febd3..25c00963c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ git-annex (0.20110602) UNRELEASED; urgency=low
* Add --numcopies option.
* Add --trust, --untrust, and --semitrust options.
* get --from is the same as copy --from
+ * Bugfix: Fix fsck to not think all SHAnE keys are bad.
-- Joey Hess <joeyh@debian.org> Wed, 01 Jun 2011 16:26:48 -0400