Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Only append non_unique parameter if a uid is provided as well to user module #3470

Merged
merged 1 commit into from
Jul 20, 2013
Merged

Only append non_unique parameter if a uid is provided as well to user module #3470

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
40 changes: 20 additions & 20 deletions library/system/user
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,8 +270,8 @@ class User(object):
cmd.append('-u')
cmd.append(self.uid)

if self.non_unique:
cmd.append('-o')
if self.non_unique:
cmd.append('-o')

if self.group is not None:
if not self.group_exists(self.group):
Expand Down Expand Up @@ -320,8 +320,8 @@ class User(object):
cmd.append('-u')
cmd.append(self.uid)

if self.non_unique:
cmd.append('-o')
if self.non_unique:
cmd.append('-o')

if self.group is not None:
if not self.group_exists(self.group):
Expand Down Expand Up @@ -578,8 +578,8 @@ class FreeBsdUser(User):
cmd.append('-u')
cmd.append(self.uid)

if self.non_unique:
cmd.append('-o')
if self.non_unique:
cmd.append('-o')

if self.comment is not None:
cmd.append('-c')
Expand Down Expand Up @@ -643,8 +643,8 @@ class FreeBsdUser(User):
cmd.append('-u')
cmd.append(self.uid)

if self.non_unique:
cmd.append('-o')
if self.non_unique:
cmd.append('-o')

if self.comment is not None and info[4] != self.comment:
cmd.append('-c')
Expand Down Expand Up @@ -739,8 +739,8 @@ class OpenBSDUser(User):
cmd.append('-u')
cmd.append(self.uid)

if self.non_unique:
cmd.append('-o')
if self.non_unique:
cmd.append('-o')

if self.group is not None:
if not self.group_exists(self.group):
Expand Down Expand Up @@ -794,8 +794,8 @@ class OpenBSDUser(User):
cmd.append('-u')
cmd.append(self.uid)

if self.non_unique:
cmd.append('-o')
if self.non_unique:
cmd.append('-o')

if self.group is not None:
if not self.group_exists(self.group):
Expand Down Expand Up @@ -889,8 +889,8 @@ class NetBSDUser(User):
cmd.append('-u')
cmd.append(self.uid)

if self.non_unique:
cmd.append('-o')
if self.non_unique:
cmd.append('-o')

if self.group is not None:
if not self.group_exists(self.group):
Expand Down Expand Up @@ -946,8 +946,8 @@ class NetBSDUser(User):
cmd.append('-u')
cmd.append(self.uid)

if self.non_unique:
cmd.append('-o')
if self.non_unique:
cmd.append('-o')

if self.group is not None:
if not self.group_exists(self.group):
Expand Down Expand Up @@ -1049,8 +1049,8 @@ class SunOS(User):
cmd.append('-u')
cmd.append(self.uid)

if self.non_unique:
cmd.append('-o')
if self.non_unique:
cmd.append('-o')

if self.group is not None:
if not self.group_exists(self.group):
Expand Down Expand Up @@ -1111,8 +1111,8 @@ class SunOS(User):
cmd.append('-u')
cmd.append(self.uid)

if self.non_unique:
cmd.append('-o')
if self.non_unique:
cmd.append('-o')

if self.group is not None:
if not self.group_exists(self.group):
Expand Down