aboutsummaryrefslogtreecommitdiff
path: root/Remote
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-11-16 00:28:10 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-11-16 00:28:10 -0400
commit3cd883d1acc24a4debe542b28e86e745959177f5 (patch)
treecf4ad5498a49c1f8d0144c5e577608eac1f20500 /Remote
parentbae9a65960268dd6dc7cc45a7a7030e9b42db93f (diff)
fix giveup shadowing
Diffstat (limited to 'Remote')
-rw-r--r--Remote/Helper/Chunked.hs10
1 files changed, 5 insertions, 5 deletions
diff --git a/Remote/Helper/Chunked.hs b/Remote/Helper/Chunked.hs
index 103dcf4ca..f3c69c38d 100644
--- a/Remote/Helper/Chunked.hs
+++ b/Remote/Helper/Chunked.hs
@@ -250,9 +250,9 @@ retrieveChunks retriever u chunkconfig encryptor basek dest basep sink
let ls' = maybe ls (setupResume ls) currsize
if any null ls'
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)
return False
@@ -273,10 +273,10 @@ retrieveChunks retriever u chunkconfig encryptor basek dest basep sink
let sz = toBytesProcessed $
fromMaybe 0 $ keyChunkSize k
getrest p h sz sz ks
- `catchNonAsync` giveup
+ `catchNonAsync` unable
case v of
Left e
- | null ls -> giveup e
+ | null ls -> unable e
| otherwise -> firstavail currsize ls
Right r -> return r
@@ -286,7 +286,7 @@ retrieveChunks retriever u chunkconfig encryptor basek dest basep sink
liftIO $ p' zeroBytesProcessed
ifM (retriever (encryptor k) p' $ tosink (Just h) p')
( getrest p h sz (addBytesProcessed bytesprocessed sz) ks
- , giveup "chunk retrieval failed"
+ , unable "chunk retrieval failed"
)
getunchunked = retriever (encryptor basek) basep $ tosink Nothing basep