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

fix prune-backups validation (again)

Browse Source 
Commit a000e26ce7 caused a test failure
in pve-manager, because now 'keep-all=0' is not thrown out upon
validation anymore. Fix the issue the commit addressed differently,
by simply creating a copy of the (shallow) hash first, and using
the logic from before the commit.

Reported-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fabian Ebner
2021-09-10 11:37:18 +02:00
committed by Thomas Lamprecht
parent a000e26ce7
commit d5fc368503
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
PVE/Storage/Plugin.pm
View File

@ -93,16 +93,17 @@ PVE::JSONSchema::register_format('prune-backups', $prune_backups_format, \&valid
sub validate_prune_backups {
my ($prune_backups) = @_;
my @positive_opts =
grep { $_ ne 'keep-all' && $prune_backups->{$_} > 0 } keys $prune_backups->%*;
my $res = { $prune_backups->%* };
if (scalar(@positive_opts) == 0) {
$prune_backups = { 'keep-all' => 1 };
} elsif ($prune_backups->{'keep-all'}) {
my $keep_all = delete $res->{'keep-all'};
if (scalar(grep { $_ > 0 } values %{$res}) == 0) {
$res = { 'keep-all' => 1 };
} elsif ($keep_all) {
die "keep-all cannot be set together with other options.\n";
}
return $prune_backups;
return $res;
}
register_standard_option('prune-backups', {
description => "The retention options with shorter intervals are processed first " .