From 74679c1c87df94bfe85162d65792b905fbdd278a Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Sat, 3 Aug 2013 14:25:27 -0400 Subject: [PATCH] Slight docs tweak and remove redundant sys.exit call --- cloud/s3 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cloud/s3 b/cloud/s3 index 7cbd1d5666d..7ef9b1d71d0 100644 --- a/cloud/s3 +++ b/cloud/s3 @@ -57,7 +57,7 @@ options: version_added: "1.2" mode: 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 default: null aliases: [] @@ -154,7 +154,6 @@ def delete_key(module, s3, bucket, obj): bucket = s3.lookup(bucket) bucket.delete_key(obj) module.exit_json(msg="Object deleted from bucket %s"%bucket, changed=True) - sys.exit(0) except s3.provider.storage_response_error, e: module.fail_json(msg= str(e))