diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-11-10 13:59:04 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-11-10 13:59:04 -0400 |
| commit | 80e731707ebae19db26065a1b05ac5f1cfd0e6a1 (patch) | |
| tree | 19b379a7ca75d3234c0293fc37f4951a141cfd01 | |
| parent | 847f21e8df109a34dd3747636244943ef3d23bfc (diff) | |
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.
| -rw-r--r-- | Command/Fsck.hs | 2 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Command/Fsck.hs b/Command/Fsck.hs index 0e0d37acf..5561f9160 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 83ccc8df5..ae3b85218 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 <id@joeyh.name> Wed, 04 Nov 2015 12:50:20 -0400 |