ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-24 22:00:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

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

Browse source 
Fixes #500
This commit is contained in:
Toshio Kuratomi 2014-12-12 11:22:20 -08:00 • committed by Matt Clay
commit 37f237ecfc
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/ansible/modules/cloud/google/gc_storage.py
View file

@ -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: