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>

diff --git a/debian/changelog b/debian/changelog
index e91a67085972cd1c1289a73fff326f88d7f60b7b..180a3f1d298dd6af563ebb51088ee6df5f039b9b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 dgit (2.6~) unstable; urgency=medium
 
-  * 
+  * Always honour --curl= and --curl:.
 
  --
 

diff --git a/dgit b/dgit
index f1f952ac3b179d45ac2bd9f647c4a545df8391ea..2dd45befc7b75adca2ba9996aaf5ec9c9cb554fe 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -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