Slight docs tweak and remove redundant sys.exit call

pull/3636/merge
Michael DeHaan 11 years ago
parent 7e6729e821
commit dab48fa3ed

@ -57,7 +57,7 @@ options:
version_added: "1.2" version_added: "1.2"
mode: mode:
description: description:
- Switches the module behaviour between put (upload), get (download), geturl (return download url), getstr (download object as string) create (bucket) and delete (bucket). - Switches the module behaviour between put (upload), get (download), geturl (return download url (Ansible 1.3+), getstr (download object as string (1.3+)), create (bucket) and delete (bucket).
required: true required: true
default: null default: null
aliases: [] aliases: []
@ -154,7 +154,6 @@ def delete_key(module, s3, bucket, obj):
bucket = s3.lookup(bucket) bucket = s3.lookup(bucket)
bucket.delete_key(obj) bucket.delete_key(obj)
module.exit_json(msg="Object deleted from bucket %s"%bucket, changed=True) module.exit_json(msg="Object deleted from bucket %s"%bucket, changed=True)
sys.exit(0)
except s3.provider.storage_response_error, e: except s3.provider.storage_response_error, e:
module.fail_json(msg= str(e)) module.fail_json(msg= str(e))

Loading…
Cancel
Save