From 0bf84ba2b6b86bcfb93bde427e6ae0e7e9ed1439 Mon Sep 17 00:00:00 2001 From: Alexei Znamensky <103110+russoz@users.noreply.github.com> Date: Sun, 22 Sep 2024 22:09:36 +1200 Subject: [PATCH] fix comprehension (#8895) * fix comprehension * add changelog frag * Update changelogs/fragments/8895-fix-comprehension.yaml Co-authored-by: Felix Fontein --------- Co-authored-by: Felix Fontein --- changelogs/fragments/8895-fix-comprehension.yaml | 2 ++ plugins/modules/lxd_container.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 changelogs/fragments/8895-fix-comprehension.yaml diff --git a/changelogs/fragments/8895-fix-comprehension.yaml b/changelogs/fragments/8895-fix-comprehension.yaml new file mode 100644 index 0000000000..aecd0fd83e --- /dev/null +++ b/changelogs/fragments/8895-fix-comprehension.yaml @@ -0,0 +1,2 @@ +bugfixes: + - lxd_container - fix bug introduced in previous commit (https://github.com/ansible-collections/community.general/pull/8895, https://github.com/ansible-collections/community.general/issues/8888). diff --git a/plugins/modules/lxd_container.py b/plugins/modules/lxd_container.py index 88e502e7c8..5c5d8a4d8d 100644 --- a/plugins/modules/lxd_container.py +++ b/plugins/modules/lxd_container.py @@ -618,7 +618,7 @@ class LXDContainerManagement(object): data = (self._get_instance_state_json() or {}).get('metadata', None) or {} network = { k: v - for k, v in data.get('network', {}).items() + for k, v in (data.get('network') or {}).items() if k not in ignore_devices } addresses = { @@ -768,7 +768,7 @@ class LXDContainerManagement(object): self.old_instance_json = self._get_instance_json() self.old_sections = { section: adjust_content(content) - for section, content in self.old_instance_json.get('metadata', {}).items() + for section, content in (self.old_instance_json.get('metadata') or {}).items() if section in set(CONFIG_PARAMS) - set(CONFIG_CREATION_PARAMS) }