Pass annex.web-options to wget and curl after other options, so that eg --no-show-progress can be set by the user to disable the default --show-progress.

2016-12-13 11:56:23 -04:00 · 2016-12-13 11:56:23 -04:00 · 59fead6da3
commit 59fead6da3
parent b0735d098d
4 changed files with 24 additions and 1 deletions
--- a/Utility/Url.hs
+++ b/Utility/Url.hs
@ -303,7 +303,7 @@ download' quiet url file uo = do
 	 - it was asked to write to a file elsewhere. -}
 	go cmd opts = withTmpDir "downloadurl" $ \tmp -> do
 		absfile <- absPath file
-		let ps = addUserAgent uo $ reqParams uo++opts++[File absfile, File url]
+		let ps = addUserAgent uo $ opts++reqParams uo++[File absfile, File url]
 		boolSystem' cmd ps $ \p -> p { cwd = Just tmp }
 	
 	quietopt s