From 3887432c54e1da6d66d364bb7f153a3c6a1cace8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 24 Sep 2012 13:16:50 -0400 Subject: fixes for transfer resume Fix resuming of downloads, which do not have a transfer info file to read. When checking upload progress, use the MVar, rather than re-reading the info file. Catch exceptions in the transfer action. Required a tryAnnex. --- Command/TransferInfo.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Command') diff --git a/Command/TransferInfo.hs b/Command/TransferInfo.hs index f64ffa765..800b72169 100644 --- a/Command/TransferInfo.hs +++ b/Command/TransferInfo.hs @@ -47,7 +47,7 @@ start (k:[]) = do , transferKey = key } info <- liftIO $ startTransferInfo file - (update, tfile) <- mkProgressUpdater t info + (update, tfile, _) <- mkProgressUpdater t info liftIO $ mapM_ void [ tryIO $ forever $ do bytes <- readish <$> getLine -- cgit v1.2.3