summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-01-03 18:39:39 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-01-03 18:40:47 -0400
commita1aea174d7bc0392cf1cdd71ecc9b863923f1940 (patch)
treeaafb724d8e3c6d7b3998dd120ceee7d747464051
parent1e929c022d3004461c238d4b8230a4ce9a5b106f (diff)
fsck: Do backend-specific check before checking numcopies is satisfied.
This way, when a checksum check fails and the content is moved aside, the numcopies check also warns if there are not enough copies.
-rw-r--r--Command/Fsck.hs2
-rw-r--r--debian/changelog1
2 files changed, 2 insertions, 1 deletions
diff --git a/Command/Fsck.hs b/Command/Fsck.hs
index 4e83455e1..723a2e740 100644
--- a/Command/Fsck.hs
+++ b/Command/Fsck.hs
@@ -40,8 +40,8 @@ perform key file backend numcopies = check
-- order matters
[ verifyLocationLog key file
, checkKeySize key
- , checkKeyNumCopies key file numcopies
, checkBackend backend key
+ , checkKeyNumCopies key file numcopies
]
{- To fsck a bare repository, fsck each key in the location log. -}
diff --git a/debian/changelog b/debian/changelog
index 607505387..d6dc7d2b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ git-annex (3.20111232) UNRELEASED; urgency=low
dotdirs.
* Added quickcheck to build dependencies, and fail if test suite cannot be
built.
+ * fsck: Do backend-specific check before checking numcopies is satisfied.
-- Joey Hess <joeyh@debian.org> Mon, 02 Jan 2012 14:19:19 -0400