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

Merge pull request #1590 from romeotheriault/minor-freebsd-user-module-fixes

Browse source 
minor freebsd user fixes
This commit is contained in:
Michael DeHaan 2012-11-10 06:33:13 -08:00
commit 001e2e564f
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
library/user
View file

@ -551,7 +551,7 @@ class FreeBsdUser(User):
# create the user # create the user
(rc, out, err) = self.execute_command(cmd) (rc, out, err) = self.execute_command(cmd)
if rc is not None and rc != 0: if rc is not None and rc != 0:
module.fail_json(name=self.name, msg=err, rc=rc) self.module.fail_json(name=self.name, msg=err, rc=rc)
# we have to set the password in a second command # we have to set the password in a second command
if self.password is not None: if self.password is not None:
@ -600,7 +600,7 @@ class FreeBsdUser(User):
groups = self.groups.split(',') groups = self.groups.split(',')
for g in groups: for g in groups:
if not self.group_exists(g): if not self.group_exists(g):
module.fail_json(msg="Group %s does not exist" % (g)) self.module.fail_json(msg="Group %s does not exist" % (g))
group_diff = set(sorted(current_groups)).symmetric_difference(set(sorted(groups))) group_diff = set(sorted(current_groups)).symmetric_difference(set(sorted(groups)))
groups_need_mod = False groups_need_mod = False
@ -618,14 +618,14 @@ class FreeBsdUser(User):
cmd.append('-G') cmd.append('-G')
new_groups = groups new_groups = groups
if self.append: if self.append:
new_groups.append(current_groups) new_groups.extend(current_groups)
cmd.append(','.join(new_groups)) cmd.append(','.join(new_groups))
# modify the user if cmd will do anything # modify the user if cmd will do anything
if cmd_len != len(cmd): if cmd_len != len(cmd):
(rc, out, err) = self.execute_command(cmd) (rc, out, err) = self.execute_command(cmd)
if rc is not None and rc != 0: if rc is not None and rc != 0:
module.fail_json(name=self.name, msg=err, rc=rc) self.module.fail_json(name=self.name, msg=err, rc=rc)
else: else:
(rc, out, err) = (None, '', '') (rc, out, err) = (None, '', '')