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 CC3A469ECC for ; Mon, 15 Feb 2021 13:25:16 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9E6F8A86A for ; Mon, 15 Feb 2021 13:25:16 +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 7EDF6A83E for ; Mon, 15 Feb 2021 13:25:15 +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 436E746260 for ; Mon, 15 Feb 2021 13:25:15 +0100 (CET) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Mon, 15 Feb 2021 13:24:57 +0100 Message-Id: <20210215122502.23854-4-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210215122502.23854-1-f.ebner@proxmox.com> References: <20210215122502.23854-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.001 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 Subject: [pve-devel] [PATCH v2 guest-common 3/8] vzdump: command line: refactor handling prune-backups 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: Mon, 15 Feb 2021 12:25:16 -0000 to re-use a line here and with the next patch. Signed-off-by: Fabian Ebner --- New in v2. PVE/VZDump/Common.pm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/PVE/VZDump/Common.pm b/PVE/VZDump/Common.pm index af141de..eceea7f 100644 --- a/PVE/VZDump/Common.pm +++ b/PVE/VZDump/Common.pm @@ -393,11 +393,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 { + $v = PVE::JSONSchema::print_property_string($v, 'prune-backups') + if $p eq 'prune-backups'; + $cmd .= " --$p " . PVE::Tools::shellquote($v) if defined($v) && $v ne ''; } } -- 2.20.1