Merge pull request #2274 from niothiel/devel

Remove duplicate logic
10 years ago · 250b1f48fc
parent 68cb148433 986d4064e9
commit 250b1f48fc
1 changed files with 5 additions and 11 deletions
--- a/cloud/amazon/s3.py
+++ b/cloud/amazon/s3.py
@ -420,13 +420,7 @@ def main():
        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)