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 /Remote | |
| 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 'Remote')
| -rw-r--r-- | Remote/Git.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Remote/Git.hs b/Remote/Git.hs index 32f6a1c7c..05dad469a 100644 --- a/Remote/Git.hs +++ b/Remote/Git.hs @@ -346,7 +346,7 @@ copyFromRemote' r key file dest forever $ send =<< readSV v let feeder = writeSV v . fromBytesProcessed - bracketIO noop (const $ tryIO $ killThread tid) (a feeder) + bracketIO noop (const $ tryIO $ killThread tid) (const $ a feeder) copyFromRemoteCheap :: Remote -> Key -> FilePath -> Annex Bool copyFromRemoteCheap r key file |