diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-07-10 00:32:23 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-07-10 00:32:23 -0400 |
| commit | c42733876bcb72d1b4c85de6bac73f1c73b216ad (patch) | |
| tree | c3edc52aa7b5b90594def0cd9eb7d4d1b8fc12d2 /Annex/Ssh.hs | |
| parent | 200b8d462e46db7b6bb87ab832529199fff58247 (diff) | |
refactor locking
Diffstat (limited to 'Annex/Ssh.hs')
| -rw-r--r-- | Annex/Ssh.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Annex/Ssh.hs b/Annex/Ssh.hs index 7b32c6196..246ac338d 100644 --- a/Annex/Ssh.hs +++ b/Annex/Ssh.hs @@ -25,7 +25,7 @@ import Data.Hash.MD5 import System.Exit import Common.Annex -import Annex.LockPool +import Annex.LockFile import qualified Build.SysConfig as SysConfig import qualified Annex import qualified Git @@ -119,13 +119,13 @@ prepSocket socketfile = do -- If the lock pool is empty, this is the first ssh of this -- run. There could be stale ssh connections hanging around -- from a previous git-annex run that was interrupted. - whenM (not . any isLock . M.keys <$> getPool) + whenM (not . any isLock . M.keys <$> getLockPool) sshCleanup -- Cleanup at end of this run. Annex.addCleanup SshCachingCleanup sshCleanup liftIO $ createDirectoryIfMissing True $ parentDir socketfile - lockFile $ socket2lock socketfile + lockFileShared $ socket2lock socketfile enumSocketFiles :: Annex [FilePath] enumSocketFiles = go =<< sshCacheDir |