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 #37386 from rallytime/fix-34841

Browse source 
Fix win_useradd.chgroups return when cmd.run_all retcode != 0
This commit is contained in:
Mike Place 2016-11-02 19:34:12 +13:00 • committed by GitHub
commit c7f4d7f76a
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/modules/win_useradd.py
View file

@ -666,7 +666,10 @@ def chgroups(name, groups, append=True):
continue
group = _cmd_quote(group).lstrip('\'').rstrip('\'')
cmd = 'net localgroup "{0}" {1} /add'.format(group, name)
__salt__['cmd.run_all'](cmd, python_shell=True)
out = __salt__['cmd.run_all'](cmd, python_shell=True)
if out['retcode'] != 0:
log.error(out['stdout'])
return False
agrps = set(list_groups(name))
return len(ugrps - agrps) == 0