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 7077CC3E9 for ; Tue, 3 May 2022 13:18:35 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 680A8412 for ; Tue, 3 May 2022 13:18:05 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 9F4063F7 for ; Tue, 3 May 2022 13:18:04 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 76508430DB for ; Tue, 3 May 2022 13:18:04 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Tue, 3 May 2022 13:17:59 +0200 Message-Id: <20220503111800.64511-2-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220503111800.64511-1-f.ebner@proxmox.com> References: <20220503111800.64511-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.083 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - 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 v2 manager 2/3] vzdump: notes-template: improve check for unknown variable 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, 03 May 2022 11:18:35 -0000 so that '{{foo}}{{bar}}' is not detected as being an unknown variable named 'foo}}{{bar', but as 'foo' (and 'bar'). Signed-off-by: Fabian Ebner --- PVE/VZDump.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm index 9af2de3d..05cc1bec 100644 --- a/PVE/VZDump.pm +++ b/PVE/VZDump.pm @@ -92,7 +92,7 @@ my $generate_notes = sub { my $vars = join('|', keys $info->%*); $notes_template =~ s/\{\{($vars)\}\}/$info->{$1}/g; - die "unexpected variable name '$1'" if $notes_template =~ m/\{\{([^\s]+)\}\}/; + die "unexpected variable name '$1'" if $notes_template =~ m/\{\{([^\s}]+)\}\}/; return $notes_template; }; -- 2.30.2