diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-05-12 19:42:09 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-05-12 19:43:24 -0400 |
| commit | 63bca9b3472a393c7ac5625f6b09d53ca9ab17fd (patch) | |
| tree | 7f0c6ac85c3ddaa22a80b169bea4f1374713cf55 /Annex/Transfer.hs | |
| parent | 608d5c78eff618bf54861ee77c69a424eeb6d25c (diff) | |
don't clean up transfer lock file when retrying transfer
This affected callers that used forwardRetry; if the 1st attempt failed it
would clean up the transfer lock before retrying.
Diffstat (limited to 'Annex/Transfer.hs')
| -rw-r--r-- | Annex/Transfer.hs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Annex/Transfer.hs b/Annex/Transfer.hs index 14a888620..d8f19eb8d 100644 --- a/Annex/Transfer.hs +++ b/Annex/Transfer.hs @@ -74,10 +74,8 @@ runTransfer' ignorelock t file shouldretry transferobserver transferaction = do showNote "transfer already in progress" return False else do - ok <- retry info metervar $ bracketIO - (return lck) - (cleanup tfile) - (const $ transferaction meter) + ok <- retry info metervar $ transferaction meter + liftIO $ cleanup tfile lck transferobserver ok t info return ok where |