proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-08-12 09:50:14 +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

18
PVE/API2/APT.pm
View File

@ -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";
} }
} }
} }
@ -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);
} }
} }
@ -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;