cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #2274 from niothiel/devel

Browse source 
Remove duplicate logic
This commit is contained in:
Brian Coca 2015-10-19 17:53:53 -04:00
commit 250b1f48fc
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cloud/amazon/s3.py
View file

@ -416,17 +416,11 @@ def main():
if acl not in CannedACLStrings:
module.fail_json(msg='Unknown permission specified: %s' % str(acl))
if overwrite not in ['always', 'never', 'different']:
if overwrite not in ['always', 'never', 'different']:
if module.boolean(overwrite):
overwrite = 'always'
else:
overwrite='never'
if overwrite not in ['always', 'never', 'different']:
if module.boolean(overwrite):
overwrite = 'always'
else:
overwrite='never'
overwrite = 'never'
region, ec2_url, aws_connect_kwargs = get_aws_connection_info(module)