mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
parent
76bd7ab25a
commit
24593f2ffb
2 changed files with 14 additions and 8 deletions
2
changelogs/fragments/avoid_spurious_unique_warnings.yml
Normal file
2
changelogs/fragments/avoid_spurious_unique_warnings.yml
Normal file
|
@ -0,0 +1,2 @@
|
|||
bugfixes:
|
||||
- Narrow the cases in which we warn about Jinja2 unique filters https://github.com/ansible/ansible/issues/46189
|
|
@ -51,7 +51,12 @@ except ImportError:
|
|||
@environmentfilter
|
||||
def unique(environment, a, case_sensitive=False, attribute=None):
|
||||
|
||||
error = None
|
||||
def _do_fail(e):
|
||||
if case_sensitive or attribute:
|
||||
raise AnsibleFilterError("Jinja2's unique filter failed and we cannot fall back to Ansible's version "
|
||||
"as it does not support the parameters supplied", orig_exc=e)
|
||||
|
||||
error = e = None
|
||||
try:
|
||||
if HAS_UNIQUE:
|
||||
c = do_unique(environment, a, case_sensitive=case_sensitive, attribute=attribute)
|
||||
|
@ -59,14 +64,13 @@ def unique(environment, a, case_sensitive=False, attribute=None):
|
|||
c = set(c)
|
||||
else:
|
||||
c = list(c)
|
||||
|
||||
except TypeError as e:
|
||||
_do_fail(e)
|
||||
except Exception as e:
|
||||
if case_sensitive or attribute:
|
||||
raise AnsibleFilterError("Jinja2's unique filter failed and we cannot fall back to Ansible's version "
|
||||
"as it does not support the parameters supplied", orig_exc=e)
|
||||
else:
|
||||
display.warning('Falling back to Ansible unique filter as Jinja2 one failed: %s' % to_text(e))
|
||||
error = e
|
||||
_do_fail(e)
|
||||
display.warning('Falling back to Ansible unique filter as Jinja2 one failed: %s' % to_text(e))
|
||||
finally:
|
||||
error = e
|
||||
|
||||
if not HAS_UNIQUE or error:
|
||||
|
||||
|
|
Loading…
Reference in a new issue