Infra: get-dm-txt: Use curl

diff --git a/debian/control b/debian/control
index 4251c22b9e67869be58a24579bdd71bd708da845..5a9d1cd764a5d1e4a54d78367a367208f2d419de 100644 (file)
--- 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 3c3a62c24847d3d2d5bd634b5d407720b4a6fdb0..9885f9eae268d5b46134329c0bf66e8a5bdd5208 100755 (executable)
--- 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