From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] applied: [PATCH guest-common] unbreak config_with_pending_array
Date: Wed, 5 Aug 2020 12:14:08 +0200 [thread overview]
Message-ID: <20200805101408.543828-1-f.gruenbichler@proxmox.com> (raw)
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);
--
2.20.1
reply other threads:[~2020-08-05 10:14 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200805101408.543828-1-f.gruenbichler@proxmox.com \
--to=f.gruenbichler@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox