From 70c55d3b42bb4650faf8626726bf17b65f16b57a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 1 Aug 2014 17:16:20 -0400 Subject: testremote: Test retrieveKeyFile resume And fixed a bug found by these tests; retrieveKeyFile would fail when the dest file was already complete. This commit was sponsored by Bradley Unterrheiner. --- Remote/Helper/Chunked.hs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Remote/Helper/Chunked.hs') diff --git a/Remote/Helper/Chunked.hs b/Remote/Helper/Chunked.hs index 9482153d1..2a156ddc5 100644 --- a/Remote/Helper/Chunked.hs +++ b/Remote/Helper/Chunked.hs @@ -241,7 +241,9 @@ retrieveChunks retriever u chunkconfig encryptor basek dest basep sink currsize <- liftIO $ catchMaybeIO $ toInteger . fileSize <$> getFileStatus dest let ls' = maybe ls (setupResume ls) currsize - firstavail currsize ls' `catchNonAsyncAnnex` giveup + if any (== 0) (map length ls') + then return True -- dest is already complete + else firstavail currsize ls' `catchNonAsyncAnnex` giveup giveup e = do warning (show e) -- cgit v1.2.3