From 469242ac4d593926fcaa177d846fdd00bcf1d6ef Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 6 May 2015 14:45:20 -0400 Subject: [PATCH] fsck: Ignore error recording the fsck in the activity log, which can happen when running fsck in a read-only repository. Closes: #698559 (fsck can still need to write to the repository if it find problems, but a successful fsck can be done read-only) --- Command/Fsck.hs | 2 +- debian/changelog | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Command/Fsck.hs b/Command/Fsck.hs index 46d7c2e776..be59484d94 100644 --- a/Command/Fsck.hs +++ b/Command/Fsck.hs @@ -76,7 +76,7 @@ seek ps = do (withFilesInGit $ whenAnnexed $ start from i) ps withFsckDb i FsckDb.closeDb - recordActivity Fsck u + void $ tryIO $ recordActivity Fsck u start :: Maybe Remote -> Incremental -> FilePath -> Key -> CommandStart start from inc file key = do diff --git a/debian/changelog b/debian/changelog index f9a0aee93a..ef13573246 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,11 @@ git-annex (5.20150421) UNRELEASED; urgency=medium symlinks when downloading from ftp. * Support checking ftp urls for file presence. * contentlocation, examinekey, lookupkey: Added --batch mode option. + * fsck: Ignore error recording the fsck in the activity log, + which can happen when running fsck in a read-only repository. + Closes: #698559 + (fsck can still need to write to the repository if it find problems, + but a successful fsck can be done read-only) -- Joey Hess Tue, 21 Apr 2015 15:54:10 -0400