diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-10-19 22:39:48 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-10-23 13:31:27 +0100 |
commit | bd3c1a7b8a2d5c8d35bea0655ec95b313cda9df2 (patch) | |
tree | 5b3571bd38bd33bb326c683f94b00f866759e2da | |
parent | f8508800a705c85c0894de5ee7107905166a28ee (diff) |
curl invocation: Always honour @curl
Use --curl= and --curl: in ftpmaster api queries and in http git
checks.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rw-r--r-- | debian/changelog | 2 | ||||
-rwxr-xr-x | dgit | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index e91a670..180a3f1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ dgit (2.6~) unstable; urgency=medium - * + * Always honour --curl= and --curl:. -- @@ -955,7 +955,7 @@ sub pool_dsc_subpath ($$) { sub archive_api_query_cmd ($) { my ($subpath) = @_; - my @cmd = qw(curl -sS); + my @cmd = (@curl, qw(-sS)); my $url = access_cfg('archive-query-url'); if ($url =~ m#^https://([-.0-9a-z]+)/#) { my $host = $1; @@ -1321,7 +1321,7 @@ sub check_for_git () { my $suffix = access_cfg('git-check-suffix','git-suffix', 'RETURN-UNDEF') // '.git'; my $url = "$prefix/$package$suffix"; - my @cmd = (qw(curl -sS -I), $url); + my @cmd = (@curl, qw(-sS -I), $url); my $result = cmdoutput @cmd; $result =~ s/^\S+ 200 .*\n\r?\n//; # curl -sS -I with https_proxy prints |