From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 28 Jun 2015 14:55:48 +0000 (+0100)
Subject: Infra: get-dm-txt: Use curl
X-Git-Tag: debian/0.30~50
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=e4cdef05877e6480ff65ffe283db28a11d1bf150;ds=sidebyside

Infra: get-dm-txt: Use curl
---

diff --git a/debian/control b/debian/control
index 4251c22b..5a9d1cd7 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Description: git interoperability with the Debian archive
  dgit clone and dgit fetch construct git commits from uploads.
 
 Package: dgit-infrastructure
-Depends: ${misc:Depends}, perl, git-core, dgit, gpgv, chiark-utils-bin, wget,
+Depends: ${misc:Depends}, perl, git-core, dgit, gpgv, chiark-utils-bin,
          libjson-perl, libdigest-sha-perl, libdbd-sqlite3-perl, sqlite3
 Architecture: all
 Priority: extra
diff --git a/infra/get-dm-txt b/infra/get-dm-txt
index 3c3a62c2..9885f9ea 100755
--- a/infra/get-dm-txt
+++ b/infra/get-dm-txt
@@ -8,11 +8,11 @@ server=ftp-master.debian.org
 path=$file
 cert=/etc/ssl/certs/$server.pem
 
-certargs="--ca-certificate=$cert --ca-directory=/dev/enoent"
+certargs="--cacert=$cert --capath=/dev/enoent"
 
 with-lock-ex -f $file.lock sh -c "
-	if ! wget $certargs \
-		-O $file.new https://$server/$path >$file.stderr 2>&1; then
+	if ! curl $certargs \
+		>$file.new https://$server/$path 2>$file.stderr; then
 		cat $file.stderr >&2
 		exit 127
 	fi