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.

diff --git a/Command/Fsck.hs b/Command/Fsck.hs
index 0e0d37acf5f31e04890027120db226b001c460c9..5561f9160360f3664806384c0a0c55e418fd0584 100644 (file)
--- 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 83ccc8df52167aceb644a1392f79e9586d385084..ae3b8521844a88030f67f75b215b184c1b3cdca2 100644 (file)
--- 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 <id@joeyh.name>  Wed, 04 Nov 2015 12:50:20 -0400