From 301b375babf1acf4a434b94d7419bdd5f7d1dec7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
Date: Wed, 5 Aug 2020 12:05:18 +0200
Subject: [PATCH] unbreak config_with_pending_array
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PVE/GuestHelpers.pm b/PVE/GuestHelpers.pm
index 1d37668..dd44344 100644
--- a/PVE/GuestHelpers.pm
+++ b/PVE/GuestHelpers.pm
@@ -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);