archive
/
ansible
mirror of https://github.com/ansible/ansible.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #3470 from langemeijer/devel

Browse Source 
Only append non_unique parameter if a uid is provided as well to user module
pull/3462/merge
Michael DeHaan 12 years ago
parent 35183f7af3 922a71fced
commit 3b3b600a98
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File

40
library/system/user
Unescape Escape View File

@ -270,8 +270,8 @@ class User(object):
cmd.append('-u') cmd.append('-u')
cmd.append(self.uid) cmd.append(self.uid)
if self.non_unique: if self.non_unique:
cmd.append('-o') cmd.append('-o')
if self.group is not None: if self.group is not None:
if not self.group_exists(self.group): if not self.group_exists(self.group):
@ -320,8 +320,8 @@ class User(object):
cmd.append('-u') cmd.append('-u')
cmd.append(self.uid) cmd.append(self.uid)
if self.non_unique: if self.non_unique:
cmd.append('-o') cmd.append('-o')
if self.group is not None: if self.group is not None:
if not self.group_exists(self.group): if not self.group_exists(self.group):
@ -578,8 +578,8 @@ class FreeBsdUser(User):
cmd.append('-u') cmd.append('-u')
cmd.append(self.uid) cmd.append(self.uid)
if self.non_unique: if self.non_unique:
cmd.append('-o') cmd.append('-o')
if self.comment is not None: if self.comment is not None:
cmd.append('-c') cmd.append('-c')
@ -643,8 +643,8 @@ class FreeBsdUser(User):
cmd.append('-u') cmd.append('-u')
cmd.append(self.uid) cmd.append(self.uid)
if self.non_unique: if self.non_unique:
cmd.append('-o') cmd.append('-o')
if self.comment is not None and info[4] != self.comment: if self.comment is not None and info[4] != self.comment:
cmd.append('-c') cmd.append('-c')
@ -739,8 +739,8 @@ class OpenBSDUser(User):
cmd.append('-u') cmd.append('-u')
cmd.append(self.uid) cmd.append(self.uid)
if self.non_unique: if self.non_unique:
cmd.append('-o') cmd.append('-o')
if self.group is not None: if self.group is not None:
if not self.group_exists(self.group): if not self.group_exists(self.group):
@ -794,8 +794,8 @@ class OpenBSDUser(User):
cmd.append('-u') cmd.append('-u')
cmd.append(self.uid) cmd.append(self.uid)
if self.non_unique: if self.non_unique:
cmd.append('-o') cmd.append('-o')
if self.group is not None: if self.group is not None:
if not self.group_exists(self.group): if not self.group_exists(self.group):
@ -889,8 +889,8 @@ class NetBSDUser(User):
cmd.append('-u') cmd.append('-u')
cmd.append(self.uid) cmd.append(self.uid)
if self.non_unique: if self.non_unique:
cmd.append('-o') cmd.append('-o')
if self.group is not None: if self.group is not None:
if not self.group_exists(self.group): if not self.group_exists(self.group):
@ -946,8 +946,8 @@ class NetBSDUser(User):
cmd.append('-u') cmd.append('-u')
cmd.append(self.uid) cmd.append(self.uid)
if self.non_unique: if self.non_unique:
cmd.append('-o') cmd.append('-o')
if self.group is not None: if self.group is not None:
if not self.group_exists(self.group): if not self.group_exists(self.group):
@ -1049,8 +1049,8 @@ class SunOS(User):
cmd.append('-u') cmd.append('-u')
cmd.append(self.uid) cmd.append(self.uid)
if self.non_unique: if self.non_unique:
cmd.append('-o') cmd.append('-o')
if self.group is not None: if self.group is not None:
if not self.group_exists(self.group): if not self.group_exists(self.group):
@ -1111,8 +1111,8 @@ class SunOS(User):
cmd.append('-u') cmd.append('-u')
cmd.append(self.uid) cmd.append(self.uid)
if self.non_unique: if self.non_unique:
cmd.append('-o') cmd.append('-o')
if self.group is not None: if self.group is not None:
if not self.group_exists(self.group): if not self.group_exists(self.group):

Write Preview
Loading…
Cancel
Save