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

Fixes #5010 Add user to all defined supplementary groups

Browse source
This commit is contained in:
James Tanner 2013-11-25 14:56:46 -05:00
parent d308aa584a
commit d187066339
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
library/system/user
View file

@ -361,7 +361,7 @@ class User(object):
if current_groups and not self.append: if current_groups and not self.append:
groups_need_mod = True groups_need_mod = True
else: else:
groups = self.get_groups_set() groups = self.get_groups_set(remove_existing=False)
group_diff = set(current_groups).symmetric_difference(groups) group_diff = set(current_groups).symmetric_difference(groups)
if group_diff: if group_diff:
@ -429,7 +429,7 @@ class User(object):
else: else:
return list(grp.getgrnam(group)) return list(grp.getgrnam(group))
def get_groups_set(self): def get_groups_set(self, remove_existing=True):
if self.groups is None: if self.groups is None:
return None return None
info = self.user_info() info = self.user_info()
@ -437,7 +437,7 @@ class User(object):
for g in set(groups): for g in set(groups):
if not self.group_exists(g): if not self.group_exists(g):
self.module.fail_json(msg="Group %s does not exist" % (g)) self.module.fail_json(msg="Group %s does not exist" % (g))
if info and self.group_info(g)[2] == info[3]: if info and remove_existing and self.group_info(g)[2] == info[3]:
groups.remove(g) groups.remove(g)
return groups return groups