proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-11-01 13:56:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

aplinfo: re-work and allow different filenames per apl source

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2019-07-19 19:15:45 +02:00
parent 53b083d57c
commit 8e96e296b8
1 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
PVE/APLInfo.pm
View File

@ -140,10 +140,11 @@ sub url_get {
}
sub download_aplinfo {
my ($ua, $aplurl, $host, $logfd) = @_;
my ($ua, $aplinfo, $logfd) = @_;
my $aplsrcurl = "$aplurl/aplinfo.dat.gz";
my $aplsigurl = "$aplurl/aplinfo.dat.asc";
my $aplsrcurl = "$aplinfo->{url}/$aplinfo->{file}.gz";
my $aplsigurl = "$aplinfo->{url}/$aplinfo->{file}.asc";
my $host = $aplinfo->{host};
my $tmp = "$aplinfodir/pveam-${host}.tmp.$$";
my $tmpgz = "$tmp.gz";
@ -173,7 +174,7 @@ sub download_aplinfo {
die "unable to verify signature - $@\n" if $@;
# test syntax
eval { read_aplinfo($tmp, {}, $aplurl, 1) };
eval { read_aplinfo($tmp, {}, $aplinfo->{url}, 1) };
die "update failed: $@" if $@;
rename($tmp, "$aplinfodir/$host") or
@ -192,12 +193,20 @@ sub download_aplinfo {
}
sub get_apl_sources {
my $urls = [];
push @$urls, "http://download.proxmox.com/images";
push @$urls, "https://releases.turnkeylinux.org/pve";
my $sources = [
{
host => "download.proxmox.com",
url => "http://download.proxmox.com/images",
file => 'aplinfo.dat',
},
{
host => "releases.turnkeylinux.org",
url => "https://releases.turnkeylinux.org/pve",
file => 'aplinfo.dat',
},
];
return $urls;
return $sources;
}
sub update {
@ -220,20 +229,18 @@ sub update {
$ua->env_proxy;
}
my $urls = get_apl_sources();
my $sources = get_apl_sources();
mkdir $aplinfodir;
my @dlerr = ();
foreach my $aplurl (@$urls) {
eval {
my $uri = URI->new($aplurl);
my $host = $uri->host();
download_aplinfo($ua, $aplurl, $host, $logfd);
foreach my $info (@$sources) {
eval {
download_aplinfo($ua, $info, $logfd);
};
if (my $err = $@) {
logmsg ($logfd, $err);
push @dlerr, $aplurl;
push @dlerr, $info->{url};
}
}
@ -246,17 +253,13 @@ sub update {
sub load_data {
my $urls = get_apl_sources();
my $sources = get_apl_sources();
my $list = {};
foreach my $aplurl (@$urls) {
eval {
my $uri = URI->new($aplurl);
my $host = $uri->host();
read_aplinfo("$aplinfodir/$host", $list, $aplurl);
foreach my $info (@$sources) {
eval {
my $host = $info->{host};
read_aplinfo("$aplinfodir/$host", $list, $info->{url});
};
warn $@ if $@;
}