[pve-devel] [PATCH v2 manager 2/3] vzdump: notes-template: improve check for unknown variable

Fabian Ebner f.ebner at proxmox.com
Tue May 3 13:17:59 CEST 2022


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 <f.ebner at proxmox.com>
---
 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





More information about the pve-devel mailing list