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

forgot some lifts

Browse source
This commit is contained in:
Joey Hess 2014-08-20 11:51:47 -04:00
parent 092041fab0
commit 83dc82c232
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Annex/LockFile.hs
View file

@ -37,7 +37,7 @@ lockFileShared file = go =<< fromLockPool file
mode <- annexFileMode mode <- annexFileMode
lockhandle <- liftIO $ noUmask mode $ lockhandle <- liftIO $ noUmask mode $
openFd file ReadOnly (Just mode) defaultFileFlags openFd file ReadOnly (Just mode) defaultFileFlags
setFdOption lockhandle CloseOnExec True liftIO $ setFdOption lockhandle CloseOnExec True
liftIO $ waitToSetLock lockhandle (ReadLock, AbsoluteSeek, 0, 0) liftIO $ waitToSetLock lockhandle (ReadLock, AbsoluteSeek, 0, 0)
#else #else
lockhandle <- liftIO $ waitToLock $ lockShared file lockhandle <- liftIO $ waitToLock $ lockShared file

2
Annex/Ssh.hs
View file

@ -153,7 +153,7 @@ sshCleanup = mapM_ cleanup =<< enumSocketFiles
mode <- annexFileMode mode <- annexFileMode
fd <- liftIO $ noUmask mode $ fd <- liftIO $ noUmask mode $
openFd lockfile ReadWrite (Just mode) defaultFileFlags openFd lockfile ReadWrite (Just mode) defaultFileFlags
setFdOption fd CloseOnExec True liftIO $ setFdOption fd CloseOnExec True
v <- liftIO $ tryIO $ v <- liftIO $ tryIO $
setLock fd (WriteLock, AbsoluteSeek, 0, 0) setLock fd (WriteLock, AbsoluteSeek, 0, 0)
case v of case v of

2
Remote/Helper/Hooks.hs
View file

@ -86,7 +86,7 @@ runHooks r starthook stophook a = do
mode <- annexFileMode mode <- annexFileMode
fd <- liftIO $ noUmask mode $ fd <- liftIO $ noUmask mode $
openFd lck ReadWrite (Just mode) defaultFileFlags openFd lck ReadWrite (Just mode) defaultFileFlags
setFdOption fd CloseOnExec True liftIO $ setFdOption fd CloseOnExec True
v <- liftIO $ tryIO $ v <- liftIO $ tryIO $
setLock fd (WriteLock, AbsoluteSeek, 0, 0) setLock fd (WriteLock, AbsoluteSeek, 0, 0)
case v of case v of