diff options
author | Joey Hess <joey@kitenet.net> | 2013-10-11 16:03:18 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2013-10-11 16:03:18 -0400 |
commit | a8728440dec6213c1e9e5347175effca30c1118e (patch) | |
tree | 6f9d3a2be0ff606912ad8571fbca286e9899b434 /Assistant/Alert.hs | |
parent | 388d27825323091f317ed380e3105f88df3f66cb (diff) |
add remote fsck interface
Currently only implemented for local git remotes. May try to add support
to git-annex-shell for ssh remotes later. Could concevably also be
supported by some special remote, although that seems unlikely.
Cronner user this when available, and when not falls back to
fsck --fast --from remote
git annex fsck --from does not itself use this interface.
To do so, I would need to pass --fast and all other options that influence
fsck on to the git annex fsck that it runs inside the remote. And that
seems like a lot of work for a result that would be no better than
cd remote; git annex fsck
This may need to be revisited if git-annex-shell gets support, since it
may be the case that the user cannot ssh to the server to run git-annex
fsck there, but can run git-annex-shell there.
This commit was sponsored by Damien Diederen.
Diffstat (limited to 'Assistant/Alert.hs')
-rw-r--r-- | Assistant/Alert.hs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Assistant/Alert.hs b/Assistant/Alert.hs index e7b731a8c..3455d0563 100644 --- a/Assistant/Alert.hs +++ b/Assistant/Alert.hs @@ -15,6 +15,7 @@ import Assistant.Alert.Utility import qualified Remote import Utility.Tense import Logs.Transfer +import Git.Remote (RemoteName) import Data.String import qualified Data.Text as T @@ -149,9 +150,11 @@ sanityCheckFixAlert msg = Alert alerthead = "The daily sanity check found and fixed a problem:" alertfoot = "If these problems persist, consider filing a bug report." -fsckAlert :: AlertButton -> Alert -fsckAlert button = baseActivityAlert - { alertData = [ UnTensed "Consistency check in progress" ] +fsckAlert :: AlertButton -> Maybe RemoteName -> Alert +fsckAlert button n = baseActivityAlert + { alertData = case n of + Nothing -> [ UnTensed $ T.pack $ "Consistency check in progress" ] + Just remotename -> [ UnTensed $ T.pack $ "Consistency check of " ++ remotename ++ " in progress"] , alertButton = Just button } |