proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-07-27 09:59:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

api apt: recduce indentation in package status update sub

Browse Source 
best viewed with `-w` flag

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2023-02-01 12:21:39 +01:00
parent a8cac426df
commit 913d893364
1 changed files with 32 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
PVE/API2/APT.pm
View File

@ -131,8 +131,7 @@ my $assemble_pkginfo = sub {
if (my $pkgfile = &$get_pkgfile($candidate_ver)) { if (my $pkgfile = &$get_pkgfile($candidate_ver)) {
$data->{Origin} = $pkgfile->{Origin}; $data->{Origin} = $pkgfile->{Origin};
my $changelog_url = $get_changelog_url->( my $changelog_url = $get_changelog_url->($pkgname, $info, $candidate_ver->{VerStr}, $pkgfile);
$pkgname, $info, $candidate_ver->{VerStr}, $pkgfile);
$data->{ChangeLogUrl} = $changelog_url if $changelog_url; $data->{ChangeLogUrl} = $changelog_url if $changelog_url;
} }
@ -178,44 +177,42 @@ my $update_pve_pkgstatus = sub {
next if !$p->{SelectedState} || ($p->{SelectedState} ne 'Install'); next if !$p->{SelectedState} || ($p->{SelectedState} ne 'Install');
my $current_ver = $p->{CurrentVer} || next; my $current_ver = $p->{CurrentVer} || next;
my $candidate_ver = $policy->candidate($p) || next; my $candidate_ver = $policy->candidate($p) || next;
next if $current_ver->{VerStr} eq $candidate_ver->{VerStr};
if ($current_ver->{VerStr} ne $candidate_ver->{VerStr}) { my $info = $pkgrecords->lookup($pkgname);
my $info = $pkgrecords->lookup($pkgname); my $res = &$assemble_pkginfo($pkgname, $info, $current_ver, $candidate_ver);
my $res = &$assemble_pkginfo($pkgname, $info, $current_ver, $candidate_ver); push @$pkglist, $res;
push @$pkglist, $res;
# also check if we need any new package # also check if we need any new package
# Note: this is just a quick hack (not recursive as it should be), because # Note: this is just a quick hack (not recursive as it should be), because
# I found no way to get that info from AptPkg # I found no way to get that info from AptPkg
if (my $deps = $candidate_ver->{DependsList}) { my $deps = $candidate_ver->{DependsList} || next;
my $found;
my $req;
for my $d (@$deps) {
if ($d->{DepType} eq 'Depends') {
$found = $d->{TargetPkg}->{SelectedState} eq 'Install' if !$found;
# need to check ProvidesList for virtual packages
if (!$found && (my $provides = $d->{TargetPkg}->{ProvidesList})) {
for my $provide ($provides->@*) {
$found = $provide->{OwnerPkg}->{SelectedState} eq 'Install';
last if $found;
}
}
$req = $d->{TargetPkg} if !$req;
if (!($d->{CompType} & AptPkg::Dep::Or)) { my ($found, $req);
if (!$found && $req) { # New required Package for my $d (@$deps) {
my $tpname = $req->{Name}; if ($d->{DepType} eq 'Depends') {
my $tpinfo = $pkgrecords->lookup($tpname); $found = $d->{TargetPkg}->{SelectedState} eq 'Install' if !$found;
my $tpcv = $policy->candidate($req); # need to check ProvidesList for virtual packages
if ($tpinfo && $tpcv) { if (!$found && (my $provides = $d->{TargetPkg}->{ProvidesList})) {
my $res = &$assemble_pkginfo($tpname, $tpinfo, undef, $tpcv); for my $provide ($provides->@*) {
push @$pkglist, $res; $found = $provide->{OwnerPkg}->{SelectedState} eq 'Install';
} last if $found;
} }
undef $found; }
undef $req; $req = $d->{TargetPkg} if !$req;
if (!($d->{CompType} & AptPkg::Dep::Or)) {
if (!$found && $req) { # New required Package
my $tpname = $req->{Name};
my $tpinfo = $pkgrecords->lookup($tpname);
my $tpcv = $policy->candidate($req);
if ($tpinfo && $tpcv) {
my $res = &$assemble_pkginfo($tpname, $tpinfo, undef, $tpcv);
push @$pkglist, $res;
} }
} }
undef $found;
undef $req;
} }
} }
} }