Pass annex.web-options to wget and curl after other options, so that eg --no-show...

diff --git a/CHANGELOG b/CHANGELOG
index 839af6559a186795fd690257466ceb64cfc1fa5b..bd3134850889b98f8d329eba21b80b4add3d6d06 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,9 @@ git-annex (6.20161211) UNRELEASED; urgency=medium
   * Debian: Build webapp on armel.
   * metadata --batch: Fix bug when conflicting metadata changes were
     made in the same batch run.
+  * 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.
 
  -- Joey Hess <id@joeyh.name>  Sun, 11 Dec 2016 21:29:51 -0400
 

diff --git a/Utility/Url.hs b/Utility/Url.hs
index d0e1b3739c81192a687908b9116a9717277b9c06..a4523d73f76bf8423f2ed4b2620f04b98fc2b804 100644 (file)
--- 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

diff --git a/doc/bugs/wget_always_shows_progress_bar.mdwn b/doc/bugs/wget_always_shows_progress_bar.mdwn
index 2829b39b0e856e7af92140b0d617f8ac982fdf32..708db8906fa855f67d4cf35b2b6b8af7854a1735 100644 (file)
--- a/doc/bugs/wget_always_shows_progress_bar.mdwn
+++ b/doc/bugs/wget_always_shows_progress_bar.mdwn
@@ -22,3 +22,4 @@ parallel git annex importfeed --relaxed --quiet ::: http://feeds.feedburner.com/
 I love git annex and use it daily.
 
 
+> [[done]] --[[Joey]]

diff --git a/doc/bugs/wget_always_shows_progress_bar/comment_1_d40883c9f9aade47112a0479ad56ed06._comment b/doc/bugs/wget_always_shows_progress_bar/comment_1_d40883c9f9aade47112a0479ad56ed06._comment
new file mode 100644 (file)
index 0000000..c2e6eb5
--- /dev/null
+++ b/doc/bugs/wget_always_shows_progress_bar/comment_1_d40883c9f9aade47112a0479ad56ed06._comment
@@ -0,0 +1,19 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 1"""
+ date="2016-12-13T15:49:20Z"
+ content="""
+Since 2014, git-annex has used wget -q --show-progress to get a
+progress bar without the several other lines of output it would normally
+display. Whether a given git-annex build does this depends on what
+version of wget it saw at configure time.
+
+Running git-annex with --quiet will disable the wget progress bar (and
+other git-annex output). This seems like the thing to do if you're running
+git-annex concurrently. (Of course, git-annex also has its own built-in
+concurrency with -J which can display multiple download progress bars in a
+nice way.)
+
+Still, might as well make the web-options come after the default options so
+they can be overridden. Doing so.
+"""]]