Skip to content

Commit

Permalink
[aws_s3] different fail msg depending on whether version is specified (
Browse files Browse the repository at this point in the history
  • Loading branch information
prasadkatti authored and willthames committed Oct 12, 2017
1 parent 3ef4f7e commit 03ec3cd
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion lib/ansible/modules/cloud/amazon/aws_s3.py
Original file line number Diff line number Diff line change
Expand Up @@ -693,7 +693,10 @@ def main():
# Next, we check to see if the key in the bucket exists. If it exists, it also returns key_matches md5sum check.
keyrtn = key_check(module, s3, bucket, obj, version=version, validate=validate)
if keyrtn is False:
module.fail_json(msg="Key %s with version id %s does not exist." % (obj, version))
if version:
module.fail_json(msg="Key %s with version id %s does not exist." % (obj, version))
else:
module.fail_json(msg="Key %s does not exist." % obj)

# If the destination path doesn't exist or overwrite is True, no need to do the md5um etag check, so just download.
# Compare the remote MD5 sum of the object with the local dest md5sum, if it already exists.
Expand Down

0 comments on commit 03ec3cd

Please sign in to comment.