aboutsummaryrefslogtreecommitdiff
path: root/Utility/Url.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-08-21 18:17:48 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-08-21 18:17:48 -0400
commit813f94706e0f4c9afa529f1eabe3f4100f45b50d (patch)
treee621cc4bda838c10e2f965a4f226df36b8a72412 /Utility/Url.hs
parent08b906fa942f6032d4150a419976489193edb18a (diff)
Revert "Delete empty downloaded file when wget fails, to work around reported resume failure."
This reverts commit 845322a564fe9ff098596f419d06ec9aa748aa2a. Better fix forthcoming
Diffstat (limited to 'Utility/Url.hs')
-rw-r--r--Utility/Url.hs12
1 files changed, 2 insertions, 10 deletions
diff --git a/Utility/Url.hs b/Utility/Url.hs
index c877583d8..508b9eeb4 100644
--- a/Utility/Url.hs
+++ b/Utility/Url.hs
@@ -118,16 +118,8 @@ download' quiet url headers options file =
- downloaded before the resume. -}
curl = go "curl" $ headerparams ++ quietopt "-s" ++
[Params "-f -L -C - -# -o"]
- go cmd opts = do
- ok <- boolSystem cmd $
- options++opts++[File file, File url]
- -- wget sometimes leaves behind an empty file on failure;
- -- remove this as it sometimes interferes with a re-download
- unless ok $ do
- size <- catchMaybeIO $ fileSize <$> getFileStatus file
- when (size == Just 0) $
- removeFile file
- return ok
+ go cmd opts = boolSystem cmd $
+ options++opts++[File file, File url]
quietopt s
| quiet = [Param s]
| otherwise = []