]> git.proxmox.com Git - pve-guest-common.git/commitdiff
unbreak config_with_pending_array
authorFabian Grünbichler <f.gruenbichler@proxmox.com>
Wed, 5 Aug 2020 10:05:18 +0000 (12:05 +0200)
committerFabian Grünbichler <f.gruenbichler@proxmox.com>
Wed, 5 Aug 2020 10:12:44 +0000 (12:12 +0200)
which lead to current and pending/delete values being returned
separately, and being misinterpreted by the web interface (and probably
other clients as well).

Fixes: daf8fca57a34417365c873ed91f3a52bf0002a4f
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
PVE/GuestHelpers.pm

index 1d376689205bbe229bd98b3a0c6b72f07e056f9a..dd443443b9cb12173e99f3b5767ea45b240956f2 100644 (file)
@@ -220,7 +220,7 @@ sub config_with_pending_array {
            key => $opt,
            value => $conf->{$opt},
        };
-       $item->{pending} = delete $pending->{$opt} if defined($conf->{pending}->{$opt});
+       $item->{pending} = delete $pending->{$opt} if defined($pending->{$opt});
        my $delete = delete $pending_delete_hash->{$opt};
        $item->{delete} = $delete->{force} ? 2 : 1 if defined($delete);