cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fixed disappearing groups on OSX user module

Browse source 
Ensure that we don't try to modify the groups collection if groups are not specified
This commit is contained in:
nitzmahone 2015-12-08 16:16:23 -05:00 committed by Matt Clay
parent 5c05016d1e
commit 0d0b78dd1e
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/ansible/modules/system/user.py
View file

@ -1673,9 +1673,10 @@ class DarwinUser(User):
self._update_system_user()
# here we don't care about change status since it is a creation,
# thus changed is always true.
(rc, _out, _err, changed) = self._modify_group()
out += _out
err += _err
if self.groups:
(rc, _out, _err, changed) = self._modify_group()
out += _out
err += _err
return (rc, err, out)
def modify_user(self):
@ -1707,12 +1708,13 @@ class DarwinUser(User):
err += _err
changed = rc
(rc, _out, _err, _changed) = self._modify_group()
out += _out
err += _err
if self.groups:
(rc, _out, _err, _changed) = self._modify_group()
out += _out
err += _err
if _changed is True:
changed = rc
if _changed is True:
changed = rc
rc = self._update_system_user()
if rc == 0: