mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

rename errorid to message-id

Browse source
This commit is contained in:
Joey Hess 2023-04-26 12:53:30 -04:00
parent b43da83a67
commit 4881bc5a53
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
4 changed files with 19 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Messages.hs
View file

@ -27,7 +27,7 @@ module Messages (
showEndFail,
showEndResult,
endResult,
ErrorId(..),
MessageId(..),
toplevelFileProblem,
toplevelWarning,
warning,
@ -203,10 +203,10 @@ endResult False = "failed"
toplevelMsg :: StringContainingQuotedPath -> StringContainingQuotedPath
toplevelMsg = ("git-annex: " <>)
toplevelFileProblem :: Bool -> ErrorId -> StringContainingQuotedPath -> String -> RawFilePath -> Maybe Key -> SeekInput -> Annex ()
toplevelFileProblem makeway errorid msg action file mkey si = do
toplevelFileProblem :: Bool -> MessageId -> StringContainingQuotedPath -> String -> RawFilePath -> Maybe Key -> SeekInput -> Annex ()
toplevelFileProblem makeway messageid msg action file mkey si = do
maybeShowJSON' $ JSON.start action (Just file) mkey si
maybeShowJSON' $ JSON.errorid errorid
maybeShowJSON' $ JSON.messageid messageid
warning' makeway id (toplevelMsg (QuotedPath file <> " " <> msg))
maybeShowJSON' $ JSON.end False