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 BBFA166230 for ; Thu, 5 Nov 2020 16:21:58 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B0C6E1A2B1 for ; Thu, 5 Nov 2020 16:21:58 +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 A6D541A2A7 for ; Thu, 5 Nov 2020 16:21:57 +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 6AC3B46026 for ; Thu, 5 Nov 2020 16:21:57 +0100 (CET) From: Stefan Reiter To: pve-devel@lists.proxmox.com Date: Thu, 5 Nov 2020 16:21:51 +0100 Message-Id: <20201105152151.16344-1-s.reiter@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.037 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. [vzdump.pm] Subject: [pve-devel] [PATCH manager] restore default value of 0 for remove/maxfiles 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: Thu, 05 Nov 2020 15:21:58 -0000 If neither the 'remove' option of vzdump nor the 'maxfiles' option in the storage config are set, assume a value of 0, i.e. do not delete anything and allow unlimited backups. Restores previous behaviour that was broken in 7ab7d6f15f. Also fixes a warning about using '== 0' on a non-number type. Signed-off-by: Stefan Reiter --- PVE/VZDump.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm index 6873ceaf..517becb1 100644 --- a/PVE/VZDump.pm +++ b/PVE/VZDump.pm @@ -474,7 +474,7 @@ sub new { if (!defined($opts->{'prune-backups'}) && !defined($opts->{maxfiles})) { $opts->{'prune-backups'} = $info->{'prune-backups'}; - $opts->{maxfiles} = $info->{maxfiles}; + $opts->{maxfiles} = $info->{maxfiles} // 0; if ($opts->{maxfiles} == 0) { # zero means keep all, so avoid triggering any remove code path to be safe $opts->{remove} = 0; -- 2.20.1