yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change var name ct to type to prevent confusion with container

Browse Source 
Signed-off-by: Tim Marx <t.marx@proxmox.com>
This commit is contained in:
Tim Marx
2019-11-21 11:43:22 +01:00
committed by Thomas Lamprecht
parent 5dae1a319b
commit a4e41b0bbf
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
PVE/Storage/Plugin.pm
View File

@ -938,21 +938,21 @@ sub list_volumes {
my $res = []; my $res = [];
my $vmlist = PVE::Cluster::get_vmlist(); my $vmlist = PVE::Cluster::get_vmlist();
foreach my $ct (@$content_types) { foreach my $type (@$content_types) {
my $data; my $data;
if ($ct eq 'images' || $ct eq 'rootdir') { if ($type eq 'images' || $type eq 'rootdir') {
$data = $class->list_images($storeid, $scfg, $vmid); $data = $class->list_images($storeid, $scfg, $vmid);
} elsif ($scfg->{path}) { } elsif ($scfg->{path}) {
my $path = $class->get_subdir($scfg, $ct); my $path = $class->get_subdir($scfg, $type);
if ($ct eq 'iso' && !defined($vmid)) { if ($type eq 'iso' && !defined($vmid)) {
$data = $get_subdir_files->($storeid, $path, 'iso'); $data = $get_subdir_files->($storeid, $path, 'iso');
} elsif ($ct eq 'vztmpl'&& !defined($vmid)) { } elsif ($type eq 'vztmpl'&& !defined($vmid)) {
$data = $get_subdir_files->($storeid, $path, 'vztmpl'); $data = $get_subdir_files->($storeid, $path, 'vztmpl');
} elsif ($ct eq 'backup') { } elsif ($type eq 'backup') {
$data = $get_subdir_files->($storeid, $path, 'backup', $vmid); $data = $get_subdir_files->($storeid, $path, 'backup', $vmid);
} elsif ($ct eq 'snippets') { } elsif ($type eq 'snippets') {
$data = $get_subdir_files->($storeid, $path, 'snippets'); $data = $get_subdir_files->($storeid, $path, 'snippets');
} }
} }
@ -960,7 +960,7 @@ sub list_volumes {
next if !$data; next if !$data;
foreach my $item (@$data) { foreach my $item (@$data) {
if ($ct eq 'images' || $ct eq 'rootdir') { if ($type eq 'images' || $type eq 'rootdir') {
my $vmtype = $vmlist->{ids}->{$item->{vmid}}->{type}; my $vmtype = $vmlist->{ids}->{$item->{vmid}}->{type};
if (defined($vmtype) && $vmtype eq 'lxc') { if (defined($vmtype) && $vmtype eq 'lxc') {
@ -968,12 +968,12 @@ sub list_volumes {
} else { } else {
$item->{content} = 'images'; $item->{content} = 'images';
} }
if (!($ct eq $item->{content})) { if (!($type eq $item->{content})) {
next; next;
} }
} else { } else {
$item->{content} = $ct; $item->{content} = $type;
} }
push @$res, $item; push @$res, $item;