Group order in user module should not matter.

Groups are not necessarily returned in the defined order, especially when the user already existed before ansible started managing the system.
This commit is contained in:
Jeroen Hoekx 2012-05-02 11:54:27 +02:00
parent 8fc393a7ef
commit 23c691bd30

7
user
View file

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