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

Merge pull request #6115 from hulu/extra-kwargs-err-check

Browse source 
Error on completely invalid kwd args; follow-up to #6093
This commit is contained in:
Joseph Hall 2013-07-11 13:49:20 -07:00
commit 6545fd96b2
4 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/modules/pw_group.py
View file

@ -33,8 +33,10 @@ def add(name, gid=None, **kwargs):
salt '*' group.add foo 3456
'''
if salt.utils.is_true(kwargs.get('system')):
if salt.utils.is_true(kwargs.pop('system', False)):
log.warning('pw_group module does not support the \'system\' argument')
if kwargs:
raise TypeError('Invalid keyword argument(s): {}'.format(kwargs))
cmd = 'pw groupadd '
if gid:

4
salt/modules/pw_user.py
View file

@ -73,8 +73,10 @@ def add(name,
salt '*' user.add name <uid> <gid> <groups> <home> <shell>
'''
if salt.utils.is_true(kwargs.get('system')):
if salt.utils.is_true(kwargs.pop('system', False)):
log.warning('pw_user module does not support the \'system\' argument')
if kwargs:
raise TypeError('Invalid keyword argument(s): {}'.format(kwargs))
if isinstance(groups, string_types):
groups = groups.split(',')

4
salt/modules/solaris_group.py
View file

@ -33,9 +33,11 @@ def add(name, gid=None, **kwargs):
salt '*' group.add foo 3456
'''
if salt.utils.is_true(kwargs.get('system')):
if salt.utils.is_true(kwargs.pop('system', False)):
log.warning('solaris_group module does not support the \'system\' '
'argument')
if kwargs:
raise TypeError('Invalid keyword argument(s): {}'.format(kwargs))
cmd = 'groupadd '
if gid:

4
salt/modules/solaris_user.py
View file

@ -74,9 +74,11 @@ def add(name,
salt '*' user.add name <uid> <gid> <groups> <home> <shell>
'''
if salt.utils.is_true(kwargs.get('system')):
if salt.utils.is_true(kwargs.pop('system', False)):
log.warning('solaris_user module does not support the \'system\' '
'argument')
if kwargs:
raise TypeError('Invalid keyword argument(s): {}'.format(kwargs))
if isinstance(groups, string_types):
groups = groups.split(',')