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

Merge pull request #295 from jhoekx/user-existing-groups

Browse source 
Group order in user module should not matter.
This commit is contained in:
Michael DeHaan 2012-05-02 04:36:47 -07:00
commit fe90650311
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
library/user
View file

@ -135,11 +135,12 @@ def user_mod(user, **kwargs):
cmd.append('-g')
cmd.append(kwargs[key])
elif key == 'groups' and kwargs[key] is not None:
for g in kwargs[key].split(','):
defined_groups = kwargs[key].split(',')
for g in defined_groups:
if not group_exists(g):
fail_json(msg="Group %s does not exist" % (g))
groups = ",".join(user_group_membership(user))
if groups != kwargs[key]:
existing_groups = user_group_membership(user)
if sorted(defined_groups) != sorted(existing_groups):
cmd.append('-G')
cmd.append(kwargs[key])
elif key == 'comment':