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

swapping out if...else approach for __opts__.get approach.

Browse source
This commit is contained in:
Gareth J. Greenaway 2019-03-19 09:19:48 -07:00
parent aa2c626cdf
commit 6a5b5b28e2
No known key found for this signature in database
GPG key ID: 10B62F8A7CAD7A41
2 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/matchers/compound_match.py
View file

@ -25,10 +25,7 @@ def match(tgt):
'''
nodegroups = __opts__.get('nodegroups', {})
matchers = salt.loader.matchers(__opts__)
if 'minion_id' in __opts__:
minion_id = __opts__['minion_id']
else:
minion_id = __opts__['id']
minion_id = __opts__.get(['minion_id'], __opts__['id'])
if not isinstance(tgt, six.string_types) and not isinstance(tgt, (list, tuple)):
log.error('Compound target received that is neither string, list nor tuple')

5
salt/matchers/glob_match.py
View file

@ -12,10 +12,7 @@ def match(tgt):
'''
Returns true if the passed glob matches the id
'''
if 'minion_id' in __opts__:
minion_id = __opts__['minion_id']
else:
minion_id = __opts__['id']
minion_id = __opts__.get('minion_id', __opts__['id'])
if not isinstance(tgt, six.string_types):
return False