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

better message when content is locked

Browse source
This commit is contained in:
Joey Hess 2011-11-10 02:59:13 -04:00
parent a218ce41cf
commit 9570421251
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Annex/Content.hs
View file

@ -23,6 +23,7 @@ module Annex.Content (
saveState saveState
) where ) where
import System.IO.Error (try)
import Control.Exception (bracket_) import Control.Exception (bracket_)
import System.Posix.Types import System.Posix.Types
@ -74,8 +75,10 @@ lockContent key a = do
where where
lock Nothing = return Nothing lock Nothing = return Nothing
lock (Just l) = do lock (Just l) = do
setLock l (WriteLock, AbsoluteSeek, 0, 0) v <- try $ setLock l (WriteLock, AbsoluteSeek, 0, 0)
return $ Just l case v of
Left _ -> error "content is locked"
Right _ -> return $ Just l
unlock Nothing = return () unlock Nothing = return ()
unlock (Just l) = closeFd l unlock (Just l) = closeFd l