saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Try/except

Browse source
This commit is contained in:
Mike Place 2015-07-20 11:03:56 -06:00
parent dd609eb440
commit ea40816621
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
salt/client/mixins.py
View file

@ -438,9 +438,16 @@ class AsyncClientMixin(object):
if suffix in ('new',):
return
outputter = self.opts.get('output', event.get('outputter', None) or event.get('return').get('outputter'))
if event.get('return').get('outputter'):
event['return'].pop('outputter')
try:
outputter = self.opts.get('output', event.get('outputter', None) or event.get('return').get('outputter'))
except AttributeError:
outputter = None
try:
if event.get('return').get('outputter'):
event['return'].pop('outputter')
except AttributeError:
pass
# if this is a ret, we have our own set of rules
if suffix == 'ret':
# Check if ouputter was passed in the return data. If this is the case,