mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

make local gcrypt storeKey be atomic

Browse source 
Reuse Remote.Directory's code.
This commit is contained in:
Joey Hess 2014-08-04 09:35:57 -04:00
parent 6cecffea89
commit 22c7a7a41a
2 changed files with 28 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Remote/GCrypt.hs
View file

@ -306,14 +306,12 @@ store :: Remote -> Remote.Rsync.RsyncOpts -> Storer
store r rsyncopts
| not $ Git.repoIsUrl (repo r) =
byteStorer $ \k b p -> guardUsable (repo r) False $ liftIO $ do
let f = gCryptLocation r k
let d = parentDir f
createDirectoryIfMissing True d
allowWrite d
void $ liftIO $ tryIO $ allowWrite f
meteredWriteFile p f b
preventWrite f
preventWrite d
let tmpdir = Git.repoLocation (repo r) </> "tmp" </> keyFile k
void $ tryIO $ createDirectoryIfMissing True tmpdir
let tmpf = tmpdir </> keyFile k
meteredWriteFile p tmpf b
let destdir = parentDir $ gCryptLocation r k
Remote.Directory.finalizeStoreGeneric tmpdir destdir
return True
| Git.repoIsSsh (repo r) = if isShell r
then fileStorer $ \k f p -> Ssh.rsyncHelper (Just p)