From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 19 Oct 2016 21:39:48 +0000 (+0100)
Subject: curl invocation: Always honour @curl
X-Git-Tag: archive/debian/2.6~4
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=bd3c1a7b8a2d5c8d35bea0655ec95b313cda9df2;hp=f8508800a705c85c0894de5ee7107905166a28ee

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 e91a6708..180a3f1d 100644
--- 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 f1f952ac..2dd45bef 100755
--- 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