mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
[PR #7124/33998a5b backport][stable-7] snap: fix case when snap list is empty (#7128)
snap: fix case when snap list is empty (#7124)
* fix case when snap list is empty
* add changelog frag
(cherry picked from commit 33998a5b70
)
Co-authored-by: Alexei Znamensky <103110+russoz@users.noreply.github.com>
This commit is contained in:
parent
ee7f44b09b
commit
b17cc09b07
4 changed files with 25 additions and 5 deletions
2
changelogs/fragments/7124-snap-empty-list.yml
Normal file
2
changelogs/fragments/7124-snap-empty-list.yml
Normal file
|
@ -0,0 +1,2 @@
|
|||
bugfixes:
|
||||
- snap - an exception was being raised when snap list was empty (https://github.com/ansible-collections/community.general/pull/7124, https://github.com/ansible-collections/community.general/issues/7120).
|
|
@ -326,11 +326,13 @@ class Snap(StateModuleHelper):
|
|||
if x.startswith("warning: no snap found")]))
|
||||
return process_(rc, out, err)
|
||||
|
||||
with self.runner("info name", output_process=process) as ctx:
|
||||
try:
|
||||
names = ctx.run(name=snaps)
|
||||
finally:
|
||||
self.vars.snapinfo_run_info.append(ctx.run_info)
|
||||
names = []
|
||||
if snaps:
|
||||
with self.runner("info name", output_process=process) as ctx:
|
||||
try:
|
||||
names = ctx.run(name=snaps)
|
||||
finally:
|
||||
self.vars.snapinfo_run_info.append(ctx.run_info)
|
||||
return names
|
||||
|
||||
def snap_status(self, snap_name, channel):
|
||||
|
|
|
@ -19,3 +19,5 @@
|
|||
ansible.builtin.include_tasks: test_dangerous.yml
|
||||
- name: Include test_3dash
|
||||
ansible.builtin.include_tasks: test_3dash.yml
|
||||
- name: Include test_empty_list
|
||||
ansible.builtin.include_tasks: test_empty_list.yml
|
||||
|
|
14
tests/integration/targets/snap/tasks/test_empty_list.yml
Normal file
14
tests/integration/targets/snap/tasks/test_empty_list.yml
Normal file
|
@ -0,0 +1,14 @@
|
|||
---
|
||||
# Copyright (c) Ansible Project
|
||||
# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
- name: Empty list present
|
||||
community.general.snap:
|
||||
name: []
|
||||
state: present
|
||||
|
||||
- name: Empty list absent
|
||||
community.general.snap:
|
||||
name: []
|
||||
state: absent
|
Loading…
Reference in a new issue