dgit: Abolish url_get in favour of url_fetch

[dgit.git] / dgit

diff --git a/dgit b/dgit
index 714d6b44caff13542436eae6e16631a0592880fa..6401524ed90dee03c18914a330c99c17fa02b36a 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -30,7 +30,7 @@ setup_sigwarn();
 
 use IO::Handle;
 use Data::Dumper;
-use LWP::UserAgent;
+use WWW::Curl::Easy;
 use Dpkg::Control::Hash;
 use File::Path;
 use File::Spec;
@@ -639,20 +639,6 @@ sub progress {
 
 our $ua;
 
-sub url_get {
-    if (!$ua) {
-       $ua = LWP::UserAgent->new();
-       $ua->env_proxy;
-    }
-    my $what = $_[$#_];
-    progress "downloading $what...";
-    my $r = $ua->get(@_) or confess "$!";
-    return undef if $r->code == 404;
-    $r->is_success or fail f_ "failed to fetch %s: %s",
-       $what, $r->status_line;
-    return $r->decoded_content(charset => 'none');
-}
-
 our ($dscdata,$dscurl,$dsc,$dsc_checked,$skew_warning_vsn);
 
 sub act_local () { return $dryrun_level <= 1; }
@@ -1196,8 +1182,7 @@ sub url_fetch ($;@) {
     my ($url, %xopts) = @_;
     # Ok404 => 1   means give undef for 404
     # AccessBase => 'archive-query' (eg)
-
-    use WWW::Curl::Easy;
+    # CurlOpts => { key => value }
 
     my $curl  = WWW::Curl::Easy->new;
     my $setopt = sub {
@@ -1212,6 +1197,10 @@ sub url_fetch ($;@) {
     $setopt->(CURLOPT_NOSIGNAL,        1);
     $setopt->(CURLOPT_WRITEDATA,       \$response_body);
 
+    my $xcurlopts = $xopts{CurlOpts} // { };
+    keys %$xcurlopts;
+    while (my ($k,$v) = each %$xcurlopts) { $setopt->($k,$v); }
+
     if ($xopts{AccessBase} && $url =~ m#^https://([-.0-9a-z]+)/#) {
        foreach my $k ("$xopts{AccessBase}-tls-key",
                       "$xopts{AccessBase}-tls-curl-ca-args") {
@@ -1745,7 +1734,7 @@ sub get_archive_dsc () {
     foreach my $vinfo (@vsns) {
        my ($vsn,$vsn_dscurl,$digester,$digest) = @$vinfo;
        $dscurl = $vsn_dscurl;
-       $dscdata = url_get($dscurl);
+       $dscdata = url_fetch($dscurl);
        if (!$dscdata) {
            $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
            next;
@@ -1799,22 +1788,11 @@ sub check_for_git () {
        my $suffix = access_cfg('git-check-suffix','git-suffix',
                                'RETURN-UNDEF') // '.git';
        my $url = "$prefix/$package$suffix";
-       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
-       # HTTP/1.0 200 Connection established
-       $result =~ m/^\S+ (404|200) /s or
-           fail +(__ "unexpected results from git check query - ").
-               Dumper($prefix, $result);
-       my $code = $1;
-       if ($code eq '404') {
-           return 0;
-       } elsif ($code eq '200') {
-           return 1;
-       } else {
-           die;
-       }
+       my $result = url_fetch $url,
+           CurlOpts => { CURLOPT_NOBODY() => 1 },
+           Ok404 => 1,
+           AccessBase => 'git-check';
+       return defined $result;
     } elsif ($how eq 'true') {
        return 1;
     } elsif ($how eq 'false') {