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

fix build failure w/o concurrent-output

Browse source 
Also removed warning on old version, since the autobuilder highlights
warnings as errors and this is too minor for that.
This commit is contained in:
Joey Hess 2017-05-19 10:25:40 -04:00
parent 9798ee3ffa
commit 37060c326a
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Messages/Concurrent.hs
View file

@ -144,6 +144,7 @@ concurrentOutputSupported = return False
- the regions will not be hidden, but the action still runs, garbling the - the regions will not be hidden, but the action still runs, garbling the
- display. -} - display. -}
hideRegionsWhile :: Annex a -> Annex a hideRegionsWhile :: Annex a -> Annex a
#ifdef WITH_CONCURRENTOUTPUT
#if MIN_VERSION_concurrent_output(1,9,0) #if MIN_VERSION_concurrent_output(1,9,0)
hideRegionsWhile a = bracketIO setup cleanup go hideRegionsWhile a = bracketIO setup cleanup go
where where
@ -153,8 +154,7 @@ hideRegionsWhile a = bracketIO setup cleanup go
liftIO $ hFlush stdout liftIO $ hFlush stdout
a a
#else #else
#ifdef WITH_CONCURRENTOUTPUT hideRegionsWhile = id
#warning Building with concurrent-output older than 1.9.0 so expect some display glitches when password prompts occur in concurrent mode #else
#endif
hideRegionsWhile = id hideRegionsWhile = id
#endif #endif