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

fix py3 scope for unique filter errors, enable filters integration tests on rhel8 beta (#48961)

Browse source 
* fix py3 scope for unique filter errors, enable filters integration tests on rhel8 beta

Signed-off-by: Adam Miller <admiller@redhat.com>

* add changelog

Signed-off-by: Adam Miller <admiller@redhat.com>
This commit is contained in:
Adam Miller 2018-12-06 00:13:26 -06:00 committed by Jordan Borean
parent 0420d606de
commit 6f90d62be3
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
changelogs/fragments/mathstuff-filter-py3-scope.yaml Normal file
View file

@ -0,0 +1,3 @@
---
minor_changes:
- "mattstuff filter - fix py3 scope for unique filter errors"

4
lib/ansible/plugins/filter/mathstuff.py
View file

@ -62,12 +62,12 @@ def unique(environment, a, case_sensitive=False, attribute=None):
else: else:
c = list(c) c = list(c)
except TypeError as e: except TypeError as e:
error = e
_do_fail(e) _do_fail(e)
except Exception as e: except Exception as e:
error = e
_do_fail(e) _do_fail(e)
display.warning('Falling back to Ansible unique filter as Jinja2 one failed: %s' % to_text(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: if not HAS_UNIQUE or error:

1
test/integration/targets/filters/aliases
View file

@ -1,2 +1 @@
shippable/posix/group2 shippable/posix/group2
skip/rhel8.0