From 78d1af3607e91e6bbffe60649a95d8a97a0bdb4b Mon Sep 17 00:00:00 2001 From: bennojoy Date: Wed, 2 Oct 2013 13:27:54 +0530 Subject: [PATCH 1/2] minor fixes --- cloud/s3 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cloud/s3 b/cloud/s3 index 5ebb71b319c..e563827ac01 100644 --- a/cloud/s3 +++ b/cloud/s3 @@ -248,7 +248,7 @@ def main(): bucket = dict(required=True), object = dict(), src = dict(), - dest = dict(), + dest = dict(default=None), mode = dict(choices=['get', 'put', 'delete', 'create', 'geturl', 'getstr'], required=True), expiry = dict(default=600, aliases=['expiration']), s3_url = dict(aliases=['S3_URL']), @@ -261,7 +261,8 @@ def main(): bucket = module.params.get('bucket') obj = module.params.get('object') src = module.params.get('src') - dest = os.path.expanduser(module.params.get('dest')) + if module.params.get('dest'): + dest = os.path.expanduser(module.params.get('dest')) mode = module.params.get('mode') expiry = int(module.params['expiry']) s3_url = module.params.get('s3_url') @@ -404,7 +405,7 @@ def main(): if deletertn is True: module.exit_json(msg="Bucket %s and all keys have been deleted."%bucket, changed=True) else: - module.fail_json(msg="Bucket does not exist.", failed=True) + module.fail_json(msg="Bucket does not exist.", Changed=False) else: module.fail_json(msg="Bucket parameter is required.", failed=True) @@ -416,7 +417,7 @@ def main(): if bucketrtn is True: module.exit_json(msg="Bucket already exists.", changed=False) else: - created = create_bucket(module, s3, bucket) + module.exit_json(msg="Bucket created succesfully", changed=create_bucket(module, s3, bucket)) if bucket and obj: bucketrtn = bucket_check(module, s3, bucket) if obj.endswith('/'): From 325b65b8c6f52337bd616fe60ba81e24650c0262 Mon Sep 17 00:00:00 2001 From: Benno Joy Date: Mon, 7 Oct 2013 18:29:03 +0530 Subject: [PATCH 2/2] change "Changed" to changed --- cloud/s3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloud/s3 b/cloud/s3 index e563827ac01..faf3279efa2 100644 --- a/cloud/s3 +++ b/cloud/s3 @@ -405,7 +405,7 @@ def main(): if deletertn is True: module.exit_json(msg="Bucket %s and all keys have been deleted."%bucket, changed=True) else: - module.fail_json(msg="Bucket does not exist.", Changed=False) + module.fail_json(msg="Bucket does not exist.", changed=False) else: module.fail_json(msg="Bucket parameter is required.", failed=True)