[pacman-dev] makepkg.conf: Pass -q as the first option to curl

Message ID 20210915133414.87222-1-evangelos@foutrelis.com
State New
Headers show
Series [pacman-dev] makepkg.conf: Pass -q as the first option to curl | expand

Commit Message

Evangelos Foutras Sept. 15, 2021, 1:34 p.m. UTC
As per curl(1), the -q (--disable) option must be first on the command
line to disable reading the curlrc config file. Without being first it
does not appear to have any effect.

Signed-off-by: Evangelos Foutras <evangelos@foutrelis.com>
---
A team member noticed this when curl 7.79.0 complained about:

  curl: --continue-at and --remote-header-name cannot be combined

Turns out they had specified --remote-header-name in ~/.curlrc.

 etc/makepkg.conf.in | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Patch

diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in
index fff5b8eb..5ad3d490 100644
--- a/etc/makepkg.conf.in
+++ b/etc/makepkg.conf.in
@@ -9,10 +9,10 @@ 
 #
 #-- The download utilities that makepkg should use to acquire sources
 #  Format: 'protocol::agent'
-DLAGENTS=('file::/usr/bin/curl -gqC - -o %o %u'
-          'ftp::/usr/bin/curl -gqfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
-          'http::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
-          'https::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
+DLAGENTS=('file::/usr/bin/curl -qgC - -o %o %u'
+          'ftp::/usr/bin/curl -qgfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
+          'http::/usr/bin/curl -qgb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
+          'https::/usr/bin/curl -qgb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
           'rsync::/usr/bin/rsync --no-motd -z %u %o'
           'scp::/usr/bin/scp -C %u %o')