proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-08-12 04:44:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

api/apt: whitespace/indentation cleanup

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2021-06-25 14:07:03 +02:00
parent 9ef058d391
commit 89e4fc8cc7
1 changed files with 30 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
PVE/API2/APT.pm
View File

@ -29,7 +29,7 @@ use AptPkg::PkgRecords;
use AptPkg::System; use AptPkg::System;
my $get_apt_cache = sub { my $get_apt_cache = sub {
my $apt_cache = AptPkg::Cache->new() || die "unable to initialize AptPkg::Cache\n"; my $apt_cache = AptPkg::Cache->new() || die "unable to initialize AptPkg::Cache\n";
return $apt_cache; return $apt_cache;
@ -38,15 +38,15 @@ my $get_apt_cache = sub {
use base qw(PVE::RESTHandler); use base qw(PVE::RESTHandler);
__PACKAGE__->register_method({ __PACKAGE__->register_method({
name => 'index', name => 'index',
path => '', path => '',
method => 'GET', method => 'GET',
description => "Directory index for apt (Advanced Package Tool).", description => "Directory index for apt (Advanced Package Tool).",
permissions => { permissions => {
user => 'all', user => 'all',
}, },
parameters => { parameters => {
additionalProperties => 0, additionalProperties => 0,
properties => { properties => {
node => get_standard_option('pve-node'), node => get_standard_option('pve-node'),
}, },
@ -64,7 +64,7 @@ __PACKAGE__->register_method({
code => sub { code => sub {
my ($param) = @_; my ($param) = @_;
my $res = [ my $res = [
{ id => 'changelog' }, { id => 'changelog' },
{ id => 'update' }, { id => 'update' },
{ id => 'versions' }, { id => 'versions' },
@ -96,15 +96,12 @@ my $get_changelog_url =sub {
my $srcpkg = $info->{SourcePkg} || $pkgname; my $srcpkg = $info->{SourcePkg} || $pkgname;
if ($origin eq 'Debian') { if ($origin eq 'Debian') {
$base =~ s!pool/updates/!pool/!; # for security channel $base =~ s!pool/updates/!pool/!; # for security channel
$changelog_url = "http://packages.debian.org/changelogs/$base/" . $changelog_url = "http://packages.debian.org/changelogs/$base/${srcpkg}_${pkgver}/changelog";
"${srcpkg}_${pkgver}/changelog";
} elsif ($origin eq 'Proxmox') { } elsif ($origin eq 'Proxmox') {
if ($component eq 'pve-enterprise') { if ($component eq 'pve-enterprise') {
$changelog_url = "https://enterprise.proxmox.com/debian/$base/" . $changelog_url = "https://enterprise.proxmox.com/debian/$base/${pkgname}_${pkgver}.changelog";
"${pkgname}_${pkgver}.changelog";
} else { } else {
$changelog_url = "http://download.proxmox.com/debian/$base/" . $changelog_url = "http://download.proxmox.com/debian/$base/${pkgname}_${pkgver}.changelog";
"${pkgname}_${pkgver}.changelog";
} }
} }
} }
@ -115,7 +112,7 @@ my $get_changelog_url =sub {
my $assemble_pkginfo = sub { my $assemble_pkginfo = sub {
my ($pkgname, $info, $current_ver, $candidate_ver) = @_; my ($pkgname, $info, $current_ver, $candidate_ver) = @_;
my $data = { my $data = {
Package => $info->{Name}, Package => $info->{Name},
Title => $info->{ShortDesc}, Title => $info->{ShortDesc},
Origin => 'unknown', Origin => 'unknown',
@ -123,7 +120,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};
if (my $changelog_url = &$get_changelog_url($pkgname, $info, $candidate_ver->{VerStr}, if (my $changelog_url = &$get_changelog_url($pkgname, $info, $candidate_ver->{VerStr},
$pkgfile->{Origin}, $pkgfile->{Component})) { $pkgfile->{Origin}, $pkgfile->{Component})) {
$data->{ChangeLogUrl} = $changelog_url; $data->{ChangeLogUrl} = $changelog_url;
} }
@ -134,7 +131,7 @@ my $assemble_pkginfo = sub {
$desc =~ s/\n / /g; $desc =~ s/\n / /g;
$data->{Description} = $desc; $data->{Description} = $desc;
} }
foreach my $k (qw(Section Arch Priority)) { foreach my $k (qw(Section Arch Priority)) {
$data->{$k} = $candidate_ver->{$k}; $data->{$k} = $candidate_ver->{$k};
} }
@ -230,8 +227,8 @@ my $update_pve_pkgstatus = sub {
}; };
__PACKAGE__->register_method({ __PACKAGE__->register_method({
name => 'list_updates', name => 'list_updates',
path => 'update', path => 'update',
method => 'GET', method => 'GET',
description => "List available updates.", description => "List available updates.",
permissions => { permissions => {
@ -240,7 +237,7 @@ __PACKAGE__->register_method({
protected => 1, protected => 1,
proxyto => 'node', proxyto => 'node',
parameters => { parameters => {
additionalProperties => 0, additionalProperties => 0,
properties => { properties => {
node => get_standard_option('pve-node'), node => get_standard_option('pve-node'),
}, },
@ -258,7 +255,7 @@ __PACKAGE__->register_method({
if (my $st1 = File::stat::stat($pve_pkgstatus_fn)) { if (my $st1 = File::stat::stat($pve_pkgstatus_fn)) {
my $st2 = File::stat::stat("/var/cache/apt/pkgcache.bin"); my $st2 = File::stat::stat("/var/cache/apt/pkgcache.bin");
my $st3 = File::stat::stat("/var/lib/dpkg/status"); my $st3 = File::stat::stat("/var/lib/dpkg/status");
if ($st2 && $st3 && $st2->mtime <= $st1->mtime && $st3->mtime <= $st1->mtime) { if ($st2 && $st3 && $st2->mtime <= $st1->mtime && $st3->mtime <= $st1->mtime) {
if (my $data = &$read_cached_pkgstatus()) { if (my $data = &$read_cached_pkgstatus()) {
return $data; return $data;
@ -272,8 +269,8 @@ __PACKAGE__->register_method({
}}); }});
__PACKAGE__->register_method({ __PACKAGE__->register_method({
name => 'update_database', name => 'update_database',
path => 'update', path => 'update',
method => 'POST', method => 'POST',
description => "This is used to resynchronize the package index files from their sources (apt-get update).", description => "This is used to resynchronize the package index files from their sources (apt-get update).",
permissions => { permissions => {
@ -282,7 +279,7 @@ __PACKAGE__->register_method({
protected => 1, protected => 1,
proxyto => 'node', proxyto => 'node',
parameters => { parameters => {
additionalProperties => 0, additionalProperties => 0,
properties => { properties => {
node => get_standard_option('pve-node'), node => get_standard_option('pve-node'),
notify => { notify => {
@ -325,7 +322,7 @@ __PACKAGE__->register_method({
my $cmd = ['apt-get', 'update']; my $cmd = ['apt-get', 'update'];
print "starting apt-get update\n" if !$param->{quiet}; print "starting apt-get update\n" if !$param->{quiet};
if ($param->{quiet}) { if ($param->{quiet}) {
PVE::Tools::run_command($cmd, outfunc => sub {}, errfunc => sub {}); PVE::Tools::run_command($cmd, outfunc => sub {}, errfunc => sub {});
} else { } else {
@ -378,8 +375,8 @@ __PACKAGE__->register_method({
}}); }});
__PACKAGE__->register_method({ __PACKAGE__->register_method({
name => 'changelog', name => 'changelog',
path => 'changelog', path => 'changelog',
method => 'GET', method => 'GET',
description => "Get package changelogs.", description => "Get package changelogs.",
permissions => { permissions => {
@ -387,7 +384,7 @@ __PACKAGE__->register_method({
}, },
proxyto => 'node', proxyto => 'node',
parameters => { parameters => {
additionalProperties => 0, additionalProperties => 0,
properties => { properties => {
node => get_standard_option('pve-node'), node => get_standard_option('pve-node'),
name => { name => {
@ -398,7 +395,7 @@ __PACKAGE__->register_method({
description => "Package version.", description => "Package version.",
type => 'string', type => 'string',
optional => 1, optional => 1,
}, },
}, },
}, },
returns => { returns => {
@ -462,8 +459,7 @@ __PACKAGE__->register_method({
if ($info->{status} eq 'Active') { if ($info->{status} eq 'Active') {
$username = $info->{key}; $username = $info->{key};
$pw = PVE::API2Tools::get_hwaddress(); $pw = PVE::API2Tools::get_hwaddress();
$ua->credentials("enterprise.proxmox.com:443", 'pve-enterprise-repository', $ua->credentials("enterprise.proxmox.com:443", 'pve-enterprise-repository', $username, $pw);
$username, $pw);
} }
} }
@ -479,8 +475,8 @@ __PACKAGE__->register_method({
}}); }});
__PACKAGE__->register_method({ __PACKAGE__->register_method({
name => 'versions', name => 'versions',
path => 'versions', path => 'versions',
method => 'GET', method => 'GET',
proxyto => 'node', proxyto => 'node',
description => "Get package information for important Proxmox packages.", description => "Get package information for important Proxmox packages.",
@ -488,7 +484,7 @@ __PACKAGE__->register_method({
check => ['perm', '/nodes/{node}', [ 'Sys.Audit' ]], check => ['perm', '/nodes/{node}', [ 'Sys.Audit' ]],
}, },
parameters => { parameters => {
additionalProperties => 0, additionalProperties => 0,
properties => { properties => {
node => get_standard_option('pve-node'), node => get_standard_option('pve-node'),
}, },
@ -569,7 +565,7 @@ __PACKAGE__->register_method({
# add the rest ordered by name, easier to find for humans # add the rest ordered by name, easier to find for humans
push @list, (sort @pkgs, @opt_pack); push @list, (sort @pkgs, @opt_pack);
my (undef, undef, $kernel_release) = POSIX::uname(); my (undef, undef, $kernel_release) = POSIX::uname();
my $pvever = PVE::pvecfg::version_text(); my $pvever = PVE::pvecfg::version_text();
@ -580,11 +576,9 @@ __PACKAGE__->register_method({
my $candidate_ver = defined($p) ? $policy->candidate($p) : undef; my $candidate_ver = defined($p) ? $policy->candidate($p) : undef;
my $res; my $res;
if (my $current_ver = $p->{CurrentVer}) { if (my $current_ver = $p->{CurrentVer}) {
$res = &$assemble_pkginfo($pkgname, $info, $current_ver, $res = $assemble_pkginfo->($pkgname, $info, $current_ver, $candidate_ver || $current_ver);
$candidate_ver || $current_ver);
} elsif ($candidate_ver) { } elsif ($candidate_ver) {
$res = &$assemble_pkginfo($pkgname, $info, $candidate_ver, $res = $assemble_pkginfo->($pkgname, $info, $candidate_ver, $candidate_ver);
$candidate_ver);
delete $res->{OldVersion}; delete $res->{OldVersion};
} else { } else {
next; next;