diff options
| -rw-r--r-- | Annex/LockFile.hs | 2 | ||||
| -rw-r--r-- | Annex/Ssh.hs | 2 | ||||
| -rw-r--r-- | Remote/Helper/Hooks.hs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Annex/LockFile.hs b/Annex/LockFile.hs index 7a5c4b0e1..bd581fd5f 100644 --- a/Annex/LockFile.hs +++ b/Annex/LockFile.hs @@ -37,7 +37,7 @@ lockFileShared file = go =<< fromLockPool file mode <- annexFileMode lockhandle <- liftIO $ noUmask mode $ openFd file ReadOnly (Just mode) defaultFileFlags - setFdOption lockhandle CloseOnExec True + liftIO $ setFdOption lockhandle CloseOnExec True liftIO $ waitToSetLock lockhandle (ReadLock, AbsoluteSeek, 0, 0) #else lockhandle <- liftIO $ waitToLock $ lockShared file diff --git a/Annex/Ssh.hs b/Annex/Ssh.hs index 238af0588..4b3ee85e5 100644 --- a/Annex/Ssh.hs +++ b/Annex/Ssh.hs @@ -153,7 +153,7 @@ sshCleanup = mapM_ cleanup =<< enumSocketFiles mode <- annexFileMode fd <- liftIO $ noUmask mode $ openFd lockfile ReadWrite (Just mode) defaultFileFlags - setFdOption fd CloseOnExec True + liftIO $ setFdOption fd CloseOnExec True v <- liftIO $ tryIO $ setLock fd (WriteLock, AbsoluteSeek, 0, 0) case v of diff --git a/Remote/Helper/Hooks.hs b/Remote/Helper/Hooks.hs index 150e9efd2..cd31a2fd5 100644 --- a/Remote/Helper/Hooks.hs +++ b/Remote/Helper/Hooks.hs @@ -86,7 +86,7 @@ runHooks r starthook stophook a = do mode <- annexFileMode fd <- liftIO $ noUmask mode $ openFd lck ReadWrite (Just mode) defaultFileFlags - setFdOption fd CloseOnExec True + liftIO $ setFdOption fd CloseOnExec True v <- liftIO $ tryIO $ setLock fd (WriteLock, AbsoluteSeek, 0, 0) case v of |