diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-08-15 17:30:16 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-08-15 17:30:40 -0400 |
| commit | 022e81407e7d806100a0882c0f23067a88b4900a (patch) | |
| tree | b8035dc47239d6b687aa83adef0d45e11ac65969 /Utility/Exception.hs | |
| parent | 52089bbe73d95c5a2c06a3c58c507129335e5580 (diff) | |
| parent | e9128138ef1e19a341d7edfda4db2d6b1f8f6b0a (diff) | |
Merge branch 'master' into s3-aws
Conflicts:
git-annex.cabal
Diffstat (limited to 'Utility/Exception.hs')
| -rw-r--r-- | Utility/Exception.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Utility/Exception.hs b/Utility/Exception.hs index 802e9e24b..ef3ab1dac 100644 --- a/Utility/Exception.hs +++ b/Utility/Exception.hs @@ -52,11 +52,11 @@ catchMsgIO a = do {- catch specialized for IO errors only -} catchIO :: MonadCatch m => m a -> (IOException -> m a) -> m a -catchIO = catch +catchIO = M.catch {- try specialized for IO errors only -} tryIO :: MonadCatch m => m a -> m (Either IOException a) -tryIO = try +tryIO = M.try {- bracket with setup and cleanup actions lifted to IO. - |