projects
/
git-annex.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
73b26a8
)
fix windows build
author
Joey Hess
<joeyh@joeyh.name>
Mon, 12 Oct 2015 19:48:59 +0000
(15:48 -0400)
committer
Joey Hess
<joeyh@joeyh.name>
Mon, 12 Oct 2015 19:48:59 +0000
(15:48 -0400)
Annex/Content.hs
patch
|
blob
|
history
diff --git
a/Annex/Content.hs
b/Annex/Content.hs
index 0b15ce53b1a525be51570be48ea528d5822c631e..9648083cb21ff9b7690c74290df51e4585937c35 100644
(file)
--- a/
Annex/Content.hs
+++ b/
Annex/Content.hs
@@
-256,8
+256,9
@@
lockContentUsing locker key a = do
maybe noop cleanuplockfile mlockfile
liftIO $ dropLock lck
#else
- unlock mlockfile mlockhandle = do
- liftIO $ maybe noop dropLock mlockhandle
+ unlock mlockfile lck = do
+ -- Can't delete a locked file on Windows
+ liftIO $ dropLock lck
maybe noop cleanuplockfile mlockfile
#endif