summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToshio Kuratomi <a.badger@gmail.com>2015-03-11 08:22:23 -0700
committerToshio Kuratomi <a.badger@gmail.com>2015-03-11 08:22:23 -0700
commit47c6dae9f326f3ddf8aac1d8ad0affaea25b07df (patch)
tree0ce49343a8380f4bcd8c75ad99d7dee3c858e638
parentcf8098788c996ff292021f956ca748da8f9dbee6 (diff)
parent05ca85a172d6d186fefe5e5dcb36c6157c34730c (diff)
downloadansible-modules-core-47c6dae9f326f3ddf8aac1d8ad0affaea25b07df.tar.gz
Merge pull request #490 from pgehres/devel
Issue #489: s3 should not fail on checksum mismtach when overwrite=no
-rw-r--r--cloud/amazon/s3.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/cloud/amazon/s3.py b/cloud/amazon/s3.py
index 1b2921a5..f7abff18 100644
--- a/cloud/amazon/s3.py
+++ b/cloud/amazon/s3.py
@@ -377,7 +377,7 @@ def main():
if overwrite is True:
download_s3file(module, s3, bucket, obj, dest)
else:
- module.fail_json(msg="WARNING: Checksums do not match. Use overwrite parameter to force download.", failed=True)
+ module.exit_json(msg="WARNING: Checksums do not match. Use overwrite parameter to force download.", failed=False)
# Firstly, if key_matches is TRUE and overwrite is not enabled, we EXIT with a helpful message.
if sum_matches is True and overwrite is False: