From cd7929034a085c827fff48afb4457d10be2befb5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 10 Nov 2015 13:59:04 -0400 Subject: [PATCH] fsck: When fscking a dead repo, avoid incorrect "fixing location log" message. keyLocations doesn't return locations in dead repos, but if we're fscking a dead repo, we want to look at what locations are actually logged for it. --- Command/Fsck.hs | 2 +- debian/changelog | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Command/Fsck.hs b/Command/Fsck.hs index 0e0d37acf5..5561f91603 100644 --- a/Command/Fsck.hs +++ b/Command/Fsck.hs @@ -235,7 +235,7 @@ verifyLocationLogRemote key desc remote present = verifyLocationLog' :: Key -> String -> Bool -> UUID -> (LogStatus -> Annex ()) -> Annex Bool verifyLocationLog' key desc present u updatestatus = do - uuids <- Remote.keyLocations key + uuids <- loggedLocations key case (present, u `elem` uuids) of (True, False) -> do fix InfoPresent diff --git a/debian/changelog b/debian/changelog index 83ccc8df52..ae3b852184 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,8 @@ git-annex (5.20151102.2) UNRELEASED; urgency=medium wrappers into $HOME/.ssh * Make git-annex-standalone.deb include the git-annex html documentation, desktop file, and base completion file, same as the regular git-annex.deb. + * fsck: When fscking a dead repo, avoid incorrect "fixing location log" + message. -- Joey Hess Wed, 04 Nov 2015 12:50:20 -0400