From cbfc9d753f63659a59e648e8fe257128c65ccb75 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Wed, 16 Nov 2022 11:23:01 +0100 Subject: [PATCH] parse config: factor out finishing reading the description comment Signed-off-by: Thomas Lamprecht --- PVE/QemuServer.pm | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 3b640891..1607ce27 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -2425,6 +2425,13 @@ sub parse_vm_config { my $conf = $res; my $descr; + my $finish_description = sub { + if (defined($descr)) { + $descr =~ s/\s+$//; + $conf->{description} = $descr; + } + $descr = undef; + }; my $section = ''; my @lines = split(/\n/, $raw); @@ -2433,11 +2440,7 @@ sub parse_vm_config { if ($line =~ m/^\[PENDING\]\s*$/i) { $section = 'pending'; - if (defined($descr)) { - $descr =~ s/\s+$//; - $conf->{description} = $descr; - } - $descr = undef; + $finish_description->(); $conf = $res->{$section} = {}; next; } elsif ($line =~ m/^\[special:cloudinit\]\s*$/i) { @@ -2448,11 +2451,7 @@ sub parse_vm_config { } elsif ($line =~ m/^\[([a-z][a-z0-9_\-]+)\]\s*$/i) { $section = $1; - if (defined($descr)) { - $descr =~ s/\s+$//; - $conf->{description} = $descr; - } - $descr = undef; + $finish_description->(); $conf = $res->{snapshots}->{$section} = {}; next; } @@ -2506,10 +2505,7 @@ sub parse_vm_config { } } - if (defined($descr)) { - $descr =~ s/\s+$//; - $conf->{description} = $descr; - } + $finish_description->(); delete $res->{snapstate}; # just to be sure return $res;