Merge branch 'robustness'

This commit is contained in:
Joey Hess 2013-05-25 15:22:18 -04:00
commit 3b1aedea3d
8 changed files with 45 additions and 35 deletions

View file

@ -354,7 +354,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