proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-08-15 02:09:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix proxversion -v for jessie release

Browse Source
This commit is contained in:
Dietmar Maurer 2015-03-06 11:30:40 +01:00
parent 196d369060
commit c0d696f9da
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
PVE/API2/APT.pm
View File

@ -524,7 +524,7 @@ __PACKAGE__->register_method({
my $pkgrecords = $cache->packages(); my $pkgrecords = $cache->packages();
# try to use a resonable ordering (most important things first) # try to use a resonable ordering (most important things first)
my @list = qw(proxmox-ve-2.6.32 pve-manager); my @list = qw(proxmox-ve-3.10.0 pve-manager);
foreach my $pkgname (keys %$cache) { foreach my $pkgname (keys %$cache) {
if ($pkgname =~ m/pve-kernel-/) { if ($pkgname =~ m/pve-kernel-/) {
@ -533,7 +533,7 @@ __PACKAGE__->register_method({
} }
} }
push @list, qw(lvm2 clvm corosync-pve openais-pve libqb0 redhat-cluster-pve resource-agents-pve fence-agents-pve pve-cluster qemu-server pve-firmware libpve-common-perl libpve-access-control libpve-storage-perl pve-libspice-server1 vncterm vzctl vzprocps vzquota pve-qemu-kvm ksm-control-daemon glusterfs-client); push @list, qw(lvm2 clvm corosync-pve libqb0 resource-agents-pve fence-agents-pve pve-cluster qemu-server pve-firmware libpve-common-perl libpve-access-control libpve-storage-perl pve-libspice-server1 vncterm vzctl vzprocps vzquota pve-qemu-kvm ksm-control-daemon glusterfs-client);
my $pkglist = []; my $pkglist = [];
@ -543,7 +543,7 @@ __PACKAGE__->register_method({
foreach my $pkgname (@list) { foreach my $pkgname (@list) {
my $p = $cache->{$pkgname}; my $p = $cache->{$pkgname};
my $info = $pkgrecords->lookup($pkgname); my $info = $pkgrecords->lookup($pkgname);
my $candidate_ver = $policy->candidate($p); 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,
@ -560,7 +560,7 @@ __PACKAGE__->register_method({
# hack: add some useful information (used by 'pveversion -v') # hack: add some useful information (used by 'pveversion -v')
if ($pkgname eq 'pve-manager') { if ($pkgname eq 'pve-manager') {
$res->{ManagerVersion} = $pvever; $res->{ManagerVersion} = $pvever;
} elsif ($pkgname eq 'proxmox-ve-2.6.32') { } elsif ($pkgname eq 'proxmox-ve-3.10.0') {
$res->{RunningKernel} = $kernel_release; $res->{RunningKernel} = $kernel_release;
} }