valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #35452 from dirk-thomas/patch-1

Browse Source 
move routine call out of try/except block
This commit is contained in:
Mike Place 2016-08-16 10:37:26 +09:00 committed by GitHub
commit 0708b546cb
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
salt/roster/ansible.py
View File

@ -139,9 +139,10 @@ class Target(object):
Execute the correct tgt_type routine and return
'''
try:
return getattr(self, 'get_{0}'.format(self.tgt_type))()
routine = getattr(self, 'get_{0}'.format(self.tgt_type))
except AttributeError:
return {}
return routine()
def get_glob(self):
'''