From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 9959269433 for ; Wed, 5 Aug 2020 12:14:13 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 90B40138A0 for ; Wed, 5 Aug 2020 12:14:13 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 210F513896 for ; Wed, 5 Aug 2020 12:14:13 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id DD080434AE for ; Wed, 5 Aug 2020 12:14:12 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Wed, 5 Aug 2020 12:14:08 +0200 Message-Id: <20200805101408.543828-1-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.046 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [guesthelpers.pm] Subject: [pve-devel] applied: [PATCH guest-common] unbreak config_with_pending_array X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Aug 2020 10:14:13 -0000 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 --- 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); -- 2.20.1