Fixup the directory name at a higher level so it can be used by both conditional branches

Fixes #500
pull/18777/head
Toshio Kuratomi 10 years ago committed by Matt Clay
parent 44cc1a75ba
commit 37f237ecfc

@ -319,11 +319,12 @@ def handle_create(module, gs, bucket, obj):
else: else:
module.exit_json(msg="Bucket created successfully", changed=create_bucket(module, gs, bucket)) module.exit_json(msg="Bucket created successfully", changed=create_bucket(module, gs, bucket))
if bucket and obj: if bucket and obj:
if obj.endswith('/'):
dirobj = obj
else:
dirobj = obj + "/"
if bucket_check(module, gs, bucket): if bucket_check(module, gs, bucket):
if obj.endswith('/'):
dirobj = obj
else:
dirobj = obj + "/"
if key_check(module, gs, bucket, dirobj): if key_check(module, gs, bucket, dirobj):
module.exit_json(msg="Bucket %s and key %s already exists."% (bucket, obj), changed=False) module.exit_json(msg="Bucket %s and key %s already exists."% (bucket, obj), changed=False)
else: else:

Loading…
Cancel
Save