From 716031238383812584297063486a14a0eada0b8e Mon Sep 17 00:00:00 2001 From: whiter Date: Tue, 7 Jul 2015 09:38:33 +1000 Subject: [PATCH] Fixed tag comparison --- lib/ansible/modules/extras/cloud/amazon/s3_bucket.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/ansible/modules/extras/cloud/amazon/s3_bucket.py b/lib/ansible/modules/extras/cloud/amazon/s3_bucket.py index 7a4bcd01607..25c085f8173 100644 --- a/lib/ansible/modules/extras/cloud/amazon/s3_bucket.py +++ b/lib/ansible/modules/extras/cloud/amazon/s3_bucket.py @@ -103,7 +103,7 @@ import xml.etree.ElementTree as ET try: import boto.ec2 - from boto.s3.connection import OrdinaryCallingFormat + from boto.s3.connection import OrdinaryCallingFormat, Location from boto.s3.tagging import Tags, TagSet from boto.exception import BotoServerError, S3CreateError, S3ResponseError HAS_BOTO = True @@ -248,7 +248,7 @@ def create_bucket(connection, module): else: current_tags_dict = dict((t.key, t.value) for t in current_tags[0]) - if sorted(current_tags_dict) != sorted(tags): + if current_tags_dict != tags: try: if tags: bucket.set_tags(create_tags_container(tags)) @@ -386,7 +386,5 @@ def main(): from ansible.module_utils.basic import * from ansible.module_utils.ec2 import * -# this is magic, see lib/ansible/module_common.py -#<> - -main() +if __name__ == '__main__': + main() \ No newline at end of file