ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-08-03 04:34:24 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

improve logic around user input

Browse source
This commit is contained in:
George Rawlinson 2020-08-17 06:22:33 +12:00
commit 34c3f9741d
No known key found for this signature in database
GPG key ID: E0959FEA8B550539
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) fingerprint = self.sanitise_fingerprint(fingerprint)
key_present = self.key_in_keyring(keyid, keyring) 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 module.check_mode:
if state == "present": if state == "present":
if (key_present and force_update) or not key_present: if (key_present and force_update) or not key_present:
@ -172,8 +181,6 @@ class PacmanKey(object):
elif keyserver: elif keyserver:
self.recv_key(keyid, keyserver, keyring) self.recv_key(keyid, keyserver, keyring)
module.exit_json(changed=True) module.exit_json(changed=True)
else:
module.fail_json(msg="expected one of: data, file, url, keyserver. got none")
elif state == "absent": elif state == "absent":
if key_present: if key_present:
self.remove_key(keyid) self.remove_key(keyid)