diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-05-06 14:45:20 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-05-06 14:45:20 -0400 |
| commit | 137cac6e685732504da466a05590b69ce0eb93a7 (patch) | |
| tree | a407edcd655a491a9950745bad39e8cbfe7b3525 | |
| parent | 321998afc69706a1739fac8c1f697688f6cd1c84 (diff) | |
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)
| -rw-r--r-- | Command/Fsck.hs | 2 | ||||
| -rw-r--r-- | debian/changelog | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Command/Fsck.hs b/Command/Fsck.hs index 46d7c2e77..be59484d9 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 f9a0aee93..ef1357324 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 <id@joeyh.name> Tue, 21 Apr 2015 15:54:10 -0400 |