diff options
| author | Dan McGee <dan@archlinux.org> | 2012-07-10 15:41:18 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2012-07-10 15:41:18 +0200 |
| commit | e41ca0f2f6e41cc61a10860d3a22c4ca490a34a8 (patch) | |
| tree | cca5ca8e117ab536055696cba83960566b36f661 /etc | |
| parent | 392fffe24126c1d0404ead75c1743411fe65310a (diff) | |
| parent | 5c1ba2d5fd5263525a0355cdce900b58dc41c916 (diff) | |
| download | pacman-e41ca0f2f6e41cc61a10860d3a22c4ca490a34a8.tar.gz pacman-e41ca0f2f6e41cc61a10860d3a22c4ca490a34a8.tar.xz | |
Merge branch 'maint'
Conflicts:
etc/makepkg.conf.in
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/makepkg.conf.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 51df4939..dcec6f5c 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -8,9 +8,9 @@ # #-- The download utilities that makepkg should use to acquire sources # Format: 'protocol::agent' -DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u' - 'http::/usr/bin/curl -b "" -fLC - --retry 3 --retry-delay 3 -o %o %u' - 'https::/usr/bin/curl -b "" -fLC - --retry 3 --retry-delay 3 -o %o %u' +DLAGENTS=('ftp::/usr/bin/curl -qfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u' + 'http::/usr/bin/curl -qb "" -fLC - --retry 3 --retry-delay 3 -o %o %u' + 'https::/usr/bin/curl -qb "" -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') |