From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 1BA9F62B1E for ; Tue, 24 Nov 2020 12:28:04 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 06739B306 for ; Tue, 24 Nov 2020 12:27:34 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 88451B2FE for ; Tue, 24 Nov 2020 12:27:33 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 43733404BF for ; Tue, 24 Nov 2020 12:27:33 +0100 (CET) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Tue, 24 Nov 2020 12:27:28 +0100 Message-Id: <20201124112728.30954-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.010 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [common.pm] Subject: [pve-devel] [PATCH v2 guest-common] vzdump: correctly handle prune-backups option in commandline and cron config X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Nov 2020 11:28:04 -0000 Previously only the hash reference was printed instead of the property string. It's also necessary to parse the property string when reading the cron config. Signed-off-by: Fabian Ebner --- PVE/VZDump/Common.pm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/PVE/VZDump/Common.pm b/PVE/VZDump/Common.pm index 63a4689..f35acbe 100644 --- a/PVE/VZDump/Common.pm +++ b/PVE/VZDump/Common.pm @@ -29,6 +29,17 @@ my $dowhash_to_dow = sub { return join ',', @da; }; +my $fixup_prune_backups_option = sub { + my ($opts) = @_; + + return if !defined($opts->{'prune-backups'}); + + $opts->{'prune-backups'} = PVE::JSONSchema::parse_property_string( + 'prune-backups', + $opts->{'prune-backups'} + ); +}; + # parse crontab style day of week sub parse_dow { my ($dowstr, $noerr) = @_; @@ -290,6 +301,8 @@ sub parse_vzdump_cron_config { $opts->{starttime} = sprintf "%02d:%02d", $hour, $minute; $opts->{dow} = &$dowhash_to_dow($dowhash); + $fixup_prune_backups_option->($opts); # parse the property string + push @$jobs, $opts; }; my $err = $@; @@ -377,6 +390,10 @@ sub command_line { foreach my $path (split(/\0/, $v || '')) { $cmd .= " --$p " . PVE::Tools::shellquote($path); } + } elsif ($p eq 'prune-backups') { + my $property_string = PVE::JSONSchema::print_property_string($v, 'prune-backups'); + $cmd .= " --$p " . PVE::Tools::shellquote($property_string) + if defined($property_string) && $property_string ne ''; } else { $cmd .= " --$p " . PVE::Tools::shellquote($v) if defined($v) && $v ne ''; } -- 2.20.1