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

pillar/reclass_adapter.py: string.find(X) > -1 ==> X in string

Browse Source
This commit is contained in:
Chris Rebert 2013-07-07 11:42:31 -07:00
parent f3e6e34ae3
commit b60e305b8b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/pillar/reclass_adapter.py
View File

@ -87,7 +87,7 @@ def ext_pillar(minion_id, pillar, **kwargs):
return reclass_ext_pillar(minion_id, pillar, **kwargs)
except TypeError as e:
if e.message.find('unexpected keyword argument') > -1:
if 'unexpected keyword argument' in e.message:
arg = e.message.split()[-1]
raise SaltInvocationError('ext_pillar.reclass: unexpected option: '\
+ arg)
@ -95,7 +95,7 @@ def ext_pillar(minion_id, pillar, **kwargs):
raise
except KeyError as e:
if e.message.find('id') > -1:
if 'id' in e.message:
raise SaltInvocationError('ext_pillar.reclass: __opts__ does not '\
'define minion ID')
else: