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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 1C71C628B6 for ; Tue, 24 Nov 2020 11:14:45 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0ACB7A07B for ; Tue, 24 Nov 2020 11:14:45 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 917BDA073 for ; Tue, 24 Nov 2020 11:14:44 +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 5F2BE406E4 for ; Tue, 24 Nov 2020 11:14:44 +0100 (CET) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Tue, 24 Nov 2020 11:14:38 +0100 Message-Id: <20201124101438.19535-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 guest-common] vzdump: print prune-backups options in command_line correctly 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 10:14:45 -0000 Otherwise it prints the hash reference instead of the prune options. Signed-off-by: Fabian Ebner --- AFAICT the result of the function was only used for printing, so this should've been a cosmetic problem only. PVE/VZDump/Common.pm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/PVE/VZDump/Common.pm b/PVE/VZDump/Common.pm index 63a4689..648c906 100644 --- a/PVE/VZDump/Common.pm +++ b/PVE/VZDump/Common.pm @@ -377,6 +377,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