mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix giveup shadowing

Browse source
This commit is contained in:
Joey Hess 2016-11-16 00:28:10 -04:00
parent 2493c2c5a4
commit 2542fb58ed
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Remote/Helper/Chunked.hs
View file

@ -250,9 +250,9 @@ retrieveChunks retriever u chunkconfig encryptor basek dest basep sink
let ls' = maybe ls (setupResume ls) currsize let ls' = maybe ls (setupResume ls) currsize
if any null ls' if any null ls'
then return True -- dest is already complete then return True -- dest is already complete
else firstavail currsize ls' `catchNonAsync` giveup else firstavail currsize ls' `catchNonAsync` unable
giveup e = do unable e = do
warning (show e) warning (show e)
return False return False
@ -273,10 +273,10 @@ retrieveChunks retriever u chunkconfig encryptor basek dest basep sink
let sz = toBytesProcessed $ let sz = toBytesProcessed $
fromMaybe 0 $ keyChunkSize k fromMaybe 0 $ keyChunkSize k
getrest p h sz sz ks getrest p h sz sz ks
`catchNonAsync` giveup `catchNonAsync` unable
case v of case v of
Left e Left e
| null ls -> giveup e | null ls -> unable e
| otherwise -> firstavail currsize ls | otherwise -> firstavail currsize ls
Right r -> return r Right r -> return r
@ -286,7 +286,7 @@ retrieveChunks retriever u chunkconfig encryptor basek dest basep sink
liftIO $ p' zeroBytesProcessed liftIO $ p' zeroBytesProcessed
ifM (retriever (encryptor k) p' $ tosink (Just h) p') ifM (retriever (encryptor k) p' $ tosink (Just h) p')
( getrest p h sz (addBytesProcessed bytesprocessed sz) ks ( getrest p h sz (addBytesProcessed bytesprocessed sz) ks
, giveup "chunk retrieval failed" , unable "chunk retrieval failed"
) )
getunchunked = retriever (encryptor basek) basep $ tosink Nothing basep getunchunked = retriever (encryptor basek) basep $ tosink Nothing basep