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

Treats both [] and {} as equal to None (#23088)

Browse source
This commit is contained in:
Chris Houseknecht 2017-03-29 22:48:21 +02:00 committed by GitHub
parent 66e29f0a7c
commit 4099eb41b9
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/ansible/modules/cloud/docker/docker_container.py
View file

@ -1288,10 +1288,19 @@ class Container(DockerBaseClass):
set_a = set(getattr(self.parameters, key)) set_a = set(getattr(self.parameters, key))
set_b = set(value) set_b = set(value)
match = (set_a <= set_b) match = (set_a <= set_b)
elif isinstance(getattr(self.parameters, key), list) and not len(getattr(self.parameters, key)) \
and value is None:
# an empty list and None are ==
continue
elif isinstance(getattr(self.parameters, key), dict) and isinstance(value, dict): elif isinstance(getattr(self.parameters, key), dict) and isinstance(value, dict):
# compare two dicts # compare two dicts
self.log("comparing two dicts: %s" % key) self.log("comparing two dicts: %s" % key)
match = self._compare_dicts(getattr(self.parameters, key), value) match = self._compare_dicts(getattr(self.parameters, key), value)
elif isinstance(getattr(self.parameters, key), dict) and \
not len(list(getattr(self.parameters, key).keys())) and value is None:
# an empty dict and None are ==
continue
else: else:
# primitive compare # primitive compare
self.log("primitive compare: %s" % key) self.log("primitive compare: %s" % key)
@ -1689,7 +1698,7 @@ class ContainerManager(DockerBaseClass):
def present(self, state): def present(self, state):
container = self._get_container(self.parameters.name) container = self._get_container(self.parameters.name)
image = self._get_image() image = self._get_image()
self.log(image, pretty_print=True)
if not container.exists: if not container.exists:
# New container # New container
self.log('No container found') self.log('No container found')