summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorAdam Miller <admiller@redhat.com>2018-12-06 07:13:26 +0100
committerJordan Borean <jborean93@gmail.com>2018-12-06 07:13:26 +0100
commit6f90d62be3f9d35dd0517f9ce3232c30866cc80c (patch)
tree407c2f0c9d5f6086041022b8e33f9d3cd295af86 /lib
parentcreate local subversion server for tests (#49047) (diff)
downloadansible-6f90d62be3f9d35dd0517f9ce3232c30866cc80c.tar.xz
ansible-6f90d62be3f9d35dd0517f9ce3232c30866cc80c.zip
fix py3 scope for unique filter errors, enable filters integration tests on rhel8 beta (#48961)
* 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>
Diffstat (limited to 'lib')
-rw-r--r--lib/ansible/plugins/filter/mathstuff.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ansible/plugins/filter/mathstuff.py b/lib/ansible/plugins/filter/mathstuff.py
index 71cd85ad9c..a0298a6494 100644
--- a/lib/ansible/plugins/filter/mathstuff.py
+++ b/lib/ansible/plugins/filter/mathstuff.py
@@ -62,12 +62,12 @@ def unique(environment, a, case_sensitive=False, attribute=None):
else:
c = list(c)
except TypeError as e:
+ error = e
_do_fail(e)
except Exception as 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: