[pve-devel] [PATCH storage] fix prune-backups validation (again)

[pve-devel] [PATCH storage] fix prune-backups validation (again)

[Fabian Ebner]

Commit a000e26ce7d30ba2b938402164a9a15e66dd123e 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>
---
 PVE/Storage/Plugin.pm | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/PVE/Storage/Plugin.pm b/PVE/Storage/Plugin.pm
index 870091d..417d1fd 100644
--- a/PVE/Storage/Plugin.pm
+++ b/PVE/Storage/Plugin.pm
@@ -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 " .
-- 
2.30.2

[pve-devel] applied: [PATCH storage] fix prune-backups validation (again)

[Thomas Lamprecht]

On 10.09.21 11:37, Fabian Ebner wrote:
> Commit a000e26ce7d30ba2b938402164a9a15e66dd123e 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>
> ---
>  PVE/Storage/Plugin.pm | 13 +++++++------
>  1 file changed, 7 insertions(+), 6 deletions(-)
> 
>

applied, thanks!