diff options
author | Joey Hess <joey@kitenet.net> | 2012-02-03 16:47:24 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2012-02-03 16:47:24 -0400 |
commit | 146c36ca545a297f1e44e3cf2c91f3c0e17c909f (patch) | |
tree | 56d6fb274427bb793155182aed7e92e2e00895ba /Annex/Content.hs | |
parent | 05f89123e08075cfbd136f37c60423c1ad38d1fe (diff) |
IO exception rework
ghc 7.4 comaplains about use of System.IO.Error to catch exceptions.
Ok, use Control.Exception, with variants specialized to only catch IO
exceptions.
Diffstat (limited to 'Annex/Content.hs')
-rw-r--r-- | Annex/Content.hs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Annex/Content.hs b/Annex/Content.hs index dcfd43866..d10370bc9 100644 --- a/Annex/Content.hs +++ b/Annex/Content.hs @@ -25,7 +25,6 @@ module Annex.Content ( preseedTmp, ) where -import System.IO.Error (try) import Control.Exception (bracket_) import System.Posix.Types @@ -79,7 +78,7 @@ lockContent key a = do where lock Nothing = return Nothing lock (Just l) = do - v <- try $ setLock l (WriteLock, AbsoluteSeek, 0, 0) + v <- tryIO $ setLock l (WriteLock, AbsoluteSeek, 0, 0) case v of Left _ -> error "content is locked" Right _ -> return $ Just l |