cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed remove_key

Browse source
This commit is contained in:
lessmian 2013-02-18 17:03:50 +01:00
parent 8958e75496
commit 8f02a2fca3
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apt_key
View file

@ -115,9 +115,9 @@ def add_key(module, key):
(rc, out, err) = module.run_command(cmd, data=key, check_rc=True) (rc, out, err) = module.run_command(cmd, data=key, check_rc=True)
return True return True
def remove_key(key_id): def remove_key(module, key_id):
# FIXME: use module.run_command, fail at point of error and don't discard useful stdin/stdout # FIXME: use module.run_command, fail at point of error and don't discard useful stdin/stdout
cmd = 'apt-key del %s' cmd = 'apt-key del %s' % key_id
(rc, out, err) = module.run_command(cmd, check_rc=True) (rc, out, err) = module.run_command(cmd, check_rc=True)
return True return True
@ -142,6 +142,7 @@ def main():
check_missing_binaries(module) check_missing_binaries(module)
keys = all_keys(module) keys = all_keys(module)
return_values = {}
if state == 'present': if state == 'present':
if key_id and key_id in keys: if key_id and key_id in keys:
@ -164,13 +165,13 @@ def main():
if not key_id: if not key_id:
module.fail_json(msg="key is required") module.fail_json(msg="key is required")
if key_id in keys: if key_id in keys:
if remove_key(key_id): if remove_key(module, key_id):
changed=True changed=True
else: else:
# FIXME: module.fail_json or exit-json immediately at point of failure # FIXME: module.fail_json or exit-json immediately at point of failure
module.fail_json(msg="error removing key_id", **return_values(True)) module.fail_json(msg="error removing key_id", **return_values)
module.exit_json(changed=changed, **return_values()) module.exit_json(changed=changed, **return_values)
# include magic from lib/ansible/module_common.py # include magic from lib/ansible/module_common.py
#<<INCLUDE_ANSIBLE_MODULE_COMMON>> #<<INCLUDE_ANSIBLE_MODULE_COMMON>>