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

send stderr to json when --json-error-messages enabled

Browse source
This commit is contained in:
Joey Hess 2018-02-19 15:28:38 -04:00
parent 63ff670cc5
commit 39b59c341f
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
4 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Messages/Internal.hs
View file

@ -60,10 +60,14 @@ outputJSON jsonbuilder s = case outputType s of
_ -> return False
outputError :: String -> Annex ()
outputError msg = withMessageState $ \s ->
if concurrentOutputEnabled s
then concurrentMessage s True msg go
else go
outputError msg = withMessageState $ \s -> case (outputType s, jsonBuffer s) of
(JSONOutput jsonoptions, Just jb) | jsonErrorMessages jsonoptions ->
let jb' = Just (JSON.addErrorMessage [msg] jb)
in Annex.changeState $ \st ->
st { Annex.output = s { jsonBuffer = jb' }
_
| concurrentOutputEnabled s -> concurrentMessage s True msg go
| otherwise -> go
where
go = liftIO $ do
hFlush stdout