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

Merge pull request #7608 from jjneely/lookup-function

Browse source 
template.py: Handle purposely raised exceptions in lookup()
This commit is contained in:
Michael DeHaan 2014-05-30 22:24:53 -04:00
commit 959af67fe3
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/ansible/utils/template.py
View file

@ -91,6 +91,9 @@ def lookup(name, *args, **kwargs):
# safely catch run failures per #5059 # safely catch run failures per #5059
try: try:
ran = instance.run(*args, inject=vars, **kwargs) ran = instance.run(*args, inject=vars, **kwargs)
except errors.AnsibleError:
# Plugin raised this on purpose
raise
except Exception, e: except Exception, e:
ran = None ran = None
if ran: if ran: