Merge pull request #342 from Jmainguy/user_el5

fixes user module for rhel5 by using -n instead of -N
reviewable/pr18780/r1
Toshio Kuratomi 11 years ago
commit 0941c9490c

@ -299,7 +299,15 @@ class User(object):
# exists with the same name as the user to prevent # exists with the same name as the user to prevent
# errors from useradd trying to create a group when # errors from useradd trying to create a group when
# USERGROUPS_ENAB is set in /etc/login.defs. # USERGROUPS_ENAB is set in /etc/login.defs.
cmd.append('-N') if os.path.exists('/etc/redhat-release'):
dist = platform.dist()
major_release = int(dist[1].split('.')[0])
if major_release <= 5:
cmd.append('-n')
else:
cmd.append('-N')
else:
cmd.append('-N')
if self.groups is not None and len(self.groups): if self.groups is not None and len(self.groups):
groups = self.get_groups_set() groups = self.get_groups_set()

Loading…
Cancel
Save