diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-05-22 20:58:27 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-05-25 15:06:02 -0400 |
| commit | 65962bdc503a084bf17a488e1a5e03c41fb29b2a (patch) | |
| tree | 67c9cab2ad06fdb81667109a3574f77359a14fdf /Logs/Transfer.hs | |
| parent | 01a004f8b0fe47007d4dd04673bddebfdf22a72c (diff) | |
improve robustness of fromDirect and replaceFile
Made fromDirect check that a file in the tree has good content (and is not
a broken symlink either) before copying it to another file that has the
same key.
Made replaceFile clean up the temp file if the action that creates it, or
the file replacement action fails.
Diffstat (limited to 'Logs/Transfer.hs')
| -rw-r--r-- | Logs/Transfer.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Logs/Transfer.hs b/Logs/Transfer.hs index 6f28ef115..47c6e7495 100644 --- a/Logs/Transfer.hs +++ b/Logs/Transfer.hs @@ -119,7 +119,7 @@ runTransfer t file shouldretry a = do mode <- annexFileMode fd <- liftIO $ prep tfile mode info ok <- retry info metervar $ - bracketIO (return fd) (cleanup tfile) (a meter) + bracketIO (return fd) (cleanup tfile) (const $ a meter) unless ok $ recordFailedTransfer t info return ok where |