summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-04-03 20:38:20 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-04-03 20:38:20 -0400
commitf1cb897e78ca0f972a909ebd0258e1f25e13fb66 (patch)
treee18603e8ec39652827f08564ba6fe6a24ac24ca8
parentdcd2cfeb6bc074bfd7705ce633b8a93a7e11fb72 (diff)
make downloadQuiet quiet again
This was broken in commit 95418cc430284b65af13105f7c63da08908dd826
-rw-r--r--Utility/Url.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Utility/Url.hs b/Utility/Url.hs
index 07be955e2..0ecc195d5 100644
--- a/Utility/Url.hs
+++ b/Utility/Url.hs
@@ -205,7 +205,7 @@ downloadQuiet :: URLString -> FilePath -> UrlOptions -> IO Bool
downloadQuiet = download' True
download' :: Bool -> URLString -> FilePath -> UrlOptions -> IO Bool
-download' quiet url file uo =
+download' quiet url file uo = do
case parseURIRelaxed url of
Just u
| uriScheme u == "file:" -> do
@@ -224,7 +224,7 @@ download' quiet url file uo =
-}
#ifndef __ANDROID__
wgetparams = catMaybes
- [ if Build.SysConfig.wgetquietprogress
+ [ if Build.SysConfig.wgetquietprogress && not quiet
then Just $ Params "-q --show-progress"
else Nothing
, Just $ Params "--clobber -c -O"