Merge branch 'usermod_fix' of https://github.com/tknguyen79/ansible into tknguyen79-usermod_fix

Conflicts:
	library/system/user
pull/5907/merge
James Cammarata 11 years ago
commit 6fe369fca0

@ -398,10 +398,10 @@ class User(object):
cmd.append(self.comment) cmd.append(self.comment)
if self.home is not None and info[5] != self.home: if self.home is not None and info[5] != self.home:
if self.move_home:
cmd.append('-m')
cmd.append('-d') cmd.append('-d')
cmd.append(self.home) cmd.append(self.home)
if self.move_home:
cmd.append('-m')
if self.shell is not None and info[6] != self.shell: if self.shell is not None and info[6] != self.shell:
cmd.append('-s') cmd.append('-s')

Loading…
Cancel
Save