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 E98E8624B8 for ; Mon, 23 Nov 2020 15:54:50 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D858B2A8CE for ; Mon, 23 Nov 2020 15:54:20 +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 A06542A8B9 for ; Mon, 23 Nov 2020 15:54:19 +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 6D86D43F1C for ; Mon, 23 Nov 2020 15:54:19 +0100 (CET) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Mon, 23 Nov 2020 15:54:15 +0100 Message-Id: <20201123145415.16434-2-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201123145415.16434-1-f.ebner@proxmox.com> References: <20201123145415.16434-1-f.ebner@proxmox.com> 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. [vzdump.pm] Subject: [pve-devel] [PATCH manager 2/2] cleanup keep-all handling 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, 23 Nov 2020 14:54:51 -0000 If keep-all is set to 0, adding it doesn't make a difference, if the key is not in the hash, it won't show up in the 'values'. Signed-off-by: Fabian Ebner --- PVE/VZDump.pm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm index 178f37f5..c37fa513 100644 --- a/PVE/VZDump.pm +++ b/PVE/VZDump.pm @@ -737,10 +737,7 @@ sub exec_backup_task { my $prune_options = $opts->{'prune-backups'}; my $backup_limit = 0; - my $keep_all = delete $prune_options->{'keep-all'}; - if ($keep_all) { - $prune_options = { 'keep-all' => 1 }; - } else { + if (!$prune_options->{'keep-all'}) { foreach my $keep (values %{$prune_options}) { $backup_limit += $keep; } -- 2.20.1