Skip to content

bypass fedpkg download issues #1115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
fwag wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

bypass fedpkg download issues #1115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions Build/Download.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ use strict;
use LWP::UserAgent;
use Digest::MD5 ();
use Digest::SHA ();
use IO::Compress::Gzip qw(gzip $GzipError);

our $debug;

Expand All @@ -33,10 +34,13 @@ our $debug;
#
sub create_ua {
my (%opt) = @_;
my $agent = $opt{'agent'} || 'openSUSE build script';
my $agent = $opt{'agent'} || 'Wget/1.21.1';
my $timeout = $opt{'timeout'} || 60;
my $ssl_opts = $opt{'ssl_opts'} || { verify_hostname => 1 };
my $ua = LWP::UserAgent->new(agent => $agent, timeout => $timeout, ssl_opts => $ssl_opts, keep_alive => 3);
$ua->default_header('Accept' => '*/*');
$ua->default_header('Accept-Encoding' => 'identity');
$ua->default_header('Connection' => 'Keep-Alive');
$ua->env_proxy;
$ua->cookie_jar($opt{'cookie_jar'}) if $opt{'cookie_jar'};
return $ua;
Expand Down Expand Up @@ -197,7 +201,22 @@ sub download {
die("download of $url failed: $status\n") unless $retry-- > 0 && $res->previous;
warn("retrying $url\n");
}
checkfiledigest($dest, $opt{'digest'}) if $opt{'digest'};
if ($opt{'digest'}) {
eval { checkfiledigest($dest, $opt{'digest'}) };
if ($@) {
# Digest failed, try again with gzip encoding
my $gz_dest = "$dest.gz";
my @headers = @{$opt{'headers'} || []};
push @headers, 'Accept-Encoding', 'gzip';
my $gz_res = eval { ua_mirror($ua, $url, $gz_dest, $opt{'maxsize'}, @headers) };
if ($@ || !$gz_res->is_success) {
unlink($gz_dest);
die($@ || "download of gzipped $url failed: " . $gz_res->status_line);
}
eval { checkfiledigest($gz_dest, $opt{'digest'}) };
die($@) if $@; # If gzipped also fails, die with the new error
}
}
if ($destfinal) {
rename($dest, $destfinal) || die("rename $dest $destfinal: $!\n");
}
Expand Down
3 changes: 2 additions & 1 deletion PBuild/RemoteAssets.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ sub fedpkg_fetch {
my @assets = grep {$_->{'digest'}} @$assets;
return unless @assets;
die("need a parsed name to download fedpkg assets\n") unless $p->{'name'};
print "fetching ".PBuild::Util::plural(scalar(@assets), 'asset')." from $url\n";
#print "fetching ".PBuild::Util::plural(scalar(@assets), 'asset')." from $url\n";
for my $asset (@assets) {
my $assetid = $asset->{'assetid'};
my $adir = "$assetdir/".substr($assetid, 0, 2);
Expand All @@ -261,6 +261,7 @@ sub fedpkg_fetch {
$path = PBuild::Util::urlencode($path);
my $fedpkg_url = $url;
$fedpkg_url =~ s/\/?$/\/$path/;
print "fetching ".PBuild::Util::plural(scalar(@assets), 'asset')." from $fedpkg_url\n";
if (Build::Download::download($fedpkg_url, "$adir/.$assetid.$$", undef, 'retry' => 3, 'digest' => $asset->{'digest'}, 'missingok' => 1, 'headers' => [ 'Accept-Encoding' => 'identity' ])) {
rename_unless_present("$adir/.$assetid.$$", "$adir/$assetid");
}
Expand Down