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

fix cabal configure

Browse source 
MIN_VERSION_base macro is not defined at cabal configure time,
so check MIN_VERSION_GLASGOW_HASKELL instead.
This commit is contained in:
Joey Hess 2016-07-05 17:08:11 -04:00
parent d6483deeb1
commit a0d6ec1c8a
Failed to extract signature
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Utility/Exception.hs
View file

@ -28,9 +28,11 @@ module Utility.Exception (
import Control.Monad.Catch as X hiding (Handler) import Control.Monad.Catch as X hiding (Handler)
import qualified Control.Monad.Catch as M import qualified Control.Monad.Catch as M
import Control.Exception (IOException, AsyncException) import Control.Exception (IOException, AsyncException)
#if MIN_VERSION_base(4,7,0) #ifdef MIN_VERSION_GLASGOW_HASKELL
#if MIN_VERSION_GLASGOW_HASKELL(7,10,0,0)
import Control.Exception (SomeAsyncException) import Control.Exception (SomeAsyncException)
#endif #endif
#endif
import Control.Monad import Control.Monad
import Control.Monad.IO.Class (liftIO, MonadIO) import Control.Monad.IO.Class (liftIO, MonadIO)
import System.IO.Error (isDoesNotExistError, ioeGetErrorType) import System.IO.Error (isDoesNotExistError, ioeGetErrorType)
@ -77,8 +79,10 @@ bracketIO setup cleanup = bracket (liftIO setup) (liftIO . cleanup)
catchNonAsync :: MonadCatch m => m a -> (SomeException -> m a) -> m a catchNonAsync :: MonadCatch m => m a -> (SomeException -> m a) -> m a
catchNonAsync a onerr = a `catches` catchNonAsync a onerr = a `catches`
[ M.Handler (\ (e :: AsyncException) -> throwM e) [ M.Handler (\ (e :: AsyncException) -> throwM e)
#if MIN_VERSION_base(4,7,0) #ifdef MIN_VERSION_GLASGOW_HASKELL
#if MIN_VERSION_GLASGOW_HASKELL(7,10,0,0)
, M.Handler (\ (e :: SomeAsyncException) -> throwM e) , M.Handler (\ (e :: SomeAsyncException) -> throwM e)
#endif
#endif #endif
, M.Handler (\ (e :: SomeException) -> onerr e) , M.Handler (\ (e :: SomeException) -> onerr e)
] ]