Merge branch 'master' into assistant

This commit is contained in:
Joey Hess 2012-08-07 13:31:43 -04:00
commit 7e2d07484f
15 changed files with 238 additions and 30 deletions

View file

@ -105,8 +105,8 @@ runTransfer 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. -}