proxmox-mirrors/pve-guest-common
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-guest-common synced 2025-07-27 09:13:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

unbreak config_with_pending_array

Browse Source 
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: daf8fca57a

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2020-08-05 12:05:18 +02:00
parent fb53d1087e
commit 301b375bab
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PVE/GuestHelpers.pm
View 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);