diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-08-20 11:51:47 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-08-20 11:51:47 -0400 |
| commit | 07505caecbf5ef89050fc701c41fea92ac569e77 (patch) | |
| tree | 1d0eabca225ce4988b58c6798b3b1bf5243f2de6 /Annex | |
| parent | b44e74ace2d74954c503930b9edb75d0aa9d7b52 (diff) | |
forgot some lifts
Diffstat (limited to 'Annex')
| -rw-r--r-- | Annex/LockFile.hs | 2 | ||||
| -rw-r--r-- | Annex/Ssh.hs | 2 |
2 files changed, 2 insertions, 2 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 |