diff options
author | Joey Hess <joey@kitenet.net> | 2014-01-28 14:17:14 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2014-01-28 14:42:03 -0400 |
commit | e48f551505b3923d7c17e3b42330060e84129673 (patch) | |
tree | 5de335f5cc25b39a5d4ca12fdb6a076e03cf34db /Annex.hs | |
parent | 4a923c3ee0e238ccc17881179bec77c6531e3ad4 (diff) |
use locking on Windows
This is all the easy cases, where there was already a separate lock file.
Diffstat (limited to 'Annex.hs')
-rw-r--r-- | Annex.hs | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -34,7 +34,6 @@ module Annex ( import "mtl" Control.Monad.Reader import "MonadCatchIO-transformers" Control.Monad.CatchIO -import System.Posix.Types (Fd) import Control.Concurrent import Common @@ -58,6 +57,7 @@ import Types.Messages import Types.UUID import Types.FileMatcher import Types.NumCopies +import Types.LockPool import qualified Utility.Matcher import qualified Data.Map as M import qualified Data.Set as S @@ -106,7 +106,7 @@ data AnnexState = AnnexState , trustmap :: Maybe TrustMap , groupmap :: Maybe GroupMap , ciphers :: M.Map StorableCipher Cipher - , lockpool :: M.Map FilePath Fd + , lockpool :: LockPool , flags :: M.Map String Bool , fields :: M.Map String String , cleanup :: M.Map String (Annex ()) |