summaryrefslogtreecommitdiff
path: root/Annex/Content.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-08-03 15:54:29 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-08-03 15:54:29 -0400
commit657fad53789cbd37076b819eae0b9f91fd92efac (patch)
treec9a69afbb94354d73df402542796b6d0e1a96871 /Annex/Content.hs
parent3888a4fbdd13647bb26fe0a4217676792cb4fc81 (diff)
windows build warning fixes
Diffstat (limited to 'Annex/Content.hs')
-rw-r--r--Annex/Content.hs5
1 files changed, 3 insertions, 2 deletions
diff --git a/Annex/Content.hs b/Annex/Content.hs
index 1a2ed06c1..077407071 100644
--- a/Annex/Content.hs
+++ b/Annex/Content.hs
@@ -176,8 +176,6 @@ lockContent key a = do
(const $ a $ ContentLock key )
where
alreadylocked = error "content is locked"
- failedtolock e = error $ "failed to lock content: " ++ show e
- trylock locker = locker `catchIO` failedtolock
cleanuplockfile lockfile = modifyContent lockfile $
void $ liftIO $ tryIO $
nukeFile lockfile
@@ -197,6 +195,9 @@ lockContent key a = do
unlock mlockfile lck = do
maybe noop cleanuplockfile mlockfile
liftIO $ dropLock lck
+
+ failedtolock e = error $ "failed to lock content: " ++ show e
+ trylock locker = locker `catchIO` failedtolock
#else
lock _ (Just lockfile) = do
modifyContent lockfile $