internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-06 13:22:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

improve logic around user input

Browse Source
This commit is contained in:
George Rawlinson
2020-08-17 06:22:33 +12:00
parent 6c66cd1e48
commit 34c3f9741d
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/modules/packaging/os/pacman_key.py
View File

@@ -143,6 +143,15 @@ class PacmanKey(object):
fingerprint = self.sanitise_fingerprint(fingerprint)
key_present = self.key_in_keyring(keyid, keyring)
if (
state == "present"
and data is None
and file is None
and url is None
and keyserver is None
):
module.fail_json(msg="expected one of: data, file, url, keyserver. got none")
if module.check_mode:
if state == "present":
if (key_present and force_update) or not key_present:
@@ -172,8 +181,6 @@ class PacmanKey(object):
elif keyserver:
self.recv_key(keyid, keyserver, keyring)
module.exit_json(changed=True)
else:
module.fail_json(msg="expected one of: data, file, url, keyserver. got none")
elif state == "absent":
if key_present:
self.remove_key(keyid)