diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-08-07 21:55:44 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-08-07 22:03:29 -0400 |
| commit | 69ef3f1025fb32a19f03517d072c1e64dcb326b7 (patch) | |
| tree | 12e38dfaa613171522309534645382ced65c485d /Command/Map.hs | |
| parent | f94f5fc8d4f567ee8a72aa4ae457d3a6b3a9e22f (diff) | |
unify exception handling into Utility.Exception
Removed old extensible-exceptions, only needed for very old ghc.
Made webdav use Utility.Exception, to work after some changes in DAV's
exception handling.
Removed Annex.Exception. Mostly this was trivial, but note that
tryAnnex is replaced with tryNonAsync and catchAnnex replaced with
catchNonAsync. In theory that could be a behavior change, since the former
caught all exceptions, and the latter don't catch async exceptions.
However, in practice, nothing in the Annex monad uses async exceptions.
Grepping for throwTo and killThread only find stuff in the assistant,
which does not seem related.
Command.Add.undo is changed to accept a SomeException, and things
that use it for rollback now catch non-async exceptions, rather than
only IOExceptions.
Diffstat (limited to 'Command/Map.hs')
| -rw-r--r-- | Command/Map.hs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Command/Map.hs b/Command/Map.hs index 5a32d7f52..a62c3e1ad 100644 --- a/Command/Map.hs +++ b/Command/Map.hs @@ -7,7 +7,6 @@ module Command.Map where -import Control.Exception.Extensible import qualified Data.Map as M import Common.Annex @@ -247,7 +246,7 @@ combineSame = map snd . nubBy sameuuid . map pair safely :: IO Git.Repo -> IO (Maybe Git.Repo) safely a = do - result <- try a :: IO (Either SomeException Git.Repo) + result <- tryNonAsync a case result of Left _ -> return Nothing Right r' -> return $ Just r' |