mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
[PR #7125/77214203 backport][stable-6] Fix inappropriate comparison on the length of a Collection (#7146)
Fix inappropriate comparison on the length of a Collection (#7125)
* Comment: Fixed inappropriate comparison on the length of a Collection. Added changlelog fragment file.
* Comment: Updated the scope of the changelog fragment based on feedback.
Co-authored-by: Felix Fontein <felix@fontein.de>
---------
Co-authored-by: Felix Fontein <felix@fontein.de>
(cherry picked from commit 7721420388
)
Co-authored-by: Munawar <munawar.hafiz@gmail.com>
This commit is contained in:
parent
d75d5f67f7
commit
97e17fcee2
2 changed files with 4 additions and 5 deletions
|
@ -0,0 +1,2 @@
|
||||||
|
bugfixes:
|
||||||
|
- oci_utils module util - fix inappropriate logical comparison expressions and makes them simpler. The previous checks had logical short circuits (https://github.com/ansible-collections/community.general/pull/7125).
|
|
@ -561,7 +561,7 @@ def are_lists_equal(s, t):
|
||||||
if s is None and t is None:
|
if s is None and t is None:
|
||||||
return True
|
return True
|
||||||
|
|
||||||
if (s is None and len(t) >= 0) or (t is None and len(s) >= 0) or (len(s) != len(t)):
|
if s is None or t is None or (len(s) != len(t)):
|
||||||
return False
|
return False
|
||||||
|
|
||||||
if len(s) == 0:
|
if len(s) == 0:
|
||||||
|
@ -1026,10 +1026,7 @@ def check_if_user_value_matches_resources_attr(
|
||||||
return
|
return
|
||||||
|
|
||||||
if (
|
if (
|
||||||
resources_value_for_attr is None
|
resources_value_for_attr is None or user_provided_value_for_attr is None
|
||||||
and len(user_provided_value_for_attr) >= 0
|
|
||||||
or user_provided_value_for_attr is None
|
|
||||||
and len(resources_value_for_attr) >= 0
|
|
||||||
):
|
):
|
||||||
res[0] = False
|
res[0] = False
|
||||||
return
|
return
|
||||||
|
|
Loading…
Reference in a new issue