diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2019-07-23 18:18:53 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2019-07-23 21:58:56 +0100 |
commit | 7821907696dbe72c977548f7ffc4e8367d551b65 (patch) | |
tree | a26e973eef94089fa8056399458e9c00414320b0 /dgit | |
parent | a778f6fe55a7672a9b0052c7b946c5fca5b7c61c (diff) |
dgit: Abolish url_get in favour of url_fetch
This removes use of LWP from dgit.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 20 |
1 files changed, 2 insertions, 18 deletions
@@ -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; } @@ -1198,8 +1184,6 @@ sub url_fetch ($;@) { # AccessBase => 'archive-query' (eg) # CurlOpts => { key => value } - use WWW::Curl::Easy; - my $curl = WWW::Curl::Easy->new; my $setopt = sub { my ($k,$v) = @_; @@ -1750,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; |