aboutsummaryrefslogtreecommitdiff
path: root/Annex
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2018-01-02 17:17:10 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2018-01-02 17:25:25 -0400
commited2c1839fd8e0616165de569cff939dc3bf6527d (patch)
tree7dd4eed72c8a32ccd53f8bb75620e205eba514a5 /Annex
parent2c16edc58f1f549cd4e5611c0f7c45fec6b66da0 (diff)
Fix several places where files in .git/annex/ were written with modes that did not take the core.sharedRepository config into account.
git grep writeFile finds some more that might also be problems, but for now I've concentrated on .git/annex/ log files. There are certianly cases where writeFile is not a problem too. This commit was sponsored by mo on Patreon.
Diffstat (limited to 'Annex')
-rw-r--r--Annex/Transfer.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Annex/Transfer.hs b/Annex/Transfer.hs
index ad617a7df..0d013d411 100644
--- a/Annex/Transfer.hs
+++ b/Annex/Transfer.hs
@@ -96,7 +96,7 @@ runTransfer' ignorelock t afile shouldretry transferaction = checkSecureHashes t
Nothing -> return (Nothing, True)
Just lockhandle -> ifM (checkSaneLock lck lockhandle)
( do
- void $ liftIO $ tryIO $
+ void $ tryIO $
writeTransferInfoFile info tfile
return (Just lockhandle, False)
, do
@@ -111,7 +111,7 @@ runTransfer' ignorelock t afile shouldretry transferaction = checkSecureHashes t
Nothing -> return (Nothing, False)
Just Nothing -> return (Nothing, True)
Just (Just lockhandle) -> do
- void $ liftIO $ tryIO $
+ void $ tryIO $
writeTransferInfoFile info tfile
return (Just lockhandle, False)
#endif