diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-08-07 13:27:50 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-08-07 13:30:08 -0400 |
| commit | 2a9077f4e92b588200eafcda4d485e95998917a2 (patch) | |
| tree | b9dd7746fd647398dfebd1ddc353b4a5367106e6 /Logs/Transfer.hs | |
| parent | 96d0a36f8589ef1ee4f23adaae7ea512adb7a617 (diff) | |
fix transfer log cleanup crash
Avoid crashing when "git annex get" fails to download from one location,
and falls back to downloading from a second location.
The problem is that git annex get calls download recursively from within
itself if the first download attempt fails. So the first time through, it
writes a transfer info file, which is then overwritten on the second,
recursive call. Then on cleanup, it tries to delete the file twice, which
of course doesn't work.
Fixed both by not crashing if the transfer file is removed, and by
changing Get to not run download recursively like that. It's the only
thing that did so, and it just seems like a bad idea.
Diffstat (limited to 'Logs/Transfer.hs')
| -rw-r--r-- | Logs/Transfer.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Logs/Transfer.hs b/Logs/Transfer.hs index b6962262d..e7f35ccb7 100644 --- a/Logs/Transfer.hs +++ b/Logs/Transfer.hs @@ -98,8 +98,8 @@ transfer t file a = do writeFile tfile $ writeTransferInfo info return fd cleanup tfile fd = do - removeFile tfile - removeFile $ transferLockFile tfile + void $ tryIO $ removeFile tfile + void $ tryIO $ removeFile $ transferLockFile tfile closeFd fd {- If a transfer is still running, returns its TransferInfo. -} |