|
|
@ -447,21 +447,23 @@ class User(object):
|
|
|
|
|
|
|
|
|
|
|
|
def group_exists(self,group):
|
|
|
|
def group_exists(self,group):
|
|
|
|
try:
|
|
|
|
try:
|
|
|
|
if group.isdigit():
|
|
|
|
# Try group as a gid first
|
|
|
|
if grp.getgrgid(int(group)):
|
|
|
|
grp.getgrgid(int(group))
|
|
|
|
return True
|
|
|
|
return True
|
|
|
|
else:
|
|
|
|
except (ValueError, KeyError):
|
|
|
|
if grp.getgrnam(group):
|
|
|
|
try:
|
|
|
|
|
|
|
|
grp.getgrnam(group)
|
|
|
|
return True
|
|
|
|
return True
|
|
|
|
except KeyError:
|
|
|
|
except KeyError:
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
|
|
|
|
|
|
|
|
def group_info(self,group):
|
|
|
|
def group_info(self, group):
|
|
|
|
if not self.group_exists(group):
|
|
|
|
if not self.group_exists(group):
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
if group.isdigit():
|
|
|
|
try:
|
|
|
|
return list(grp.getgrgid(group))
|
|
|
|
# Try group as a gid first
|
|
|
|
else:
|
|
|
|
return list(grp.getgrgid(int(group)))
|
|
|
|
|
|
|
|
except (ValueError, KeyError):
|
|
|
|
return list(grp.getgrnam(group))
|
|
|
|
return list(grp.getgrnam(group))
|
|
|
|
|
|
|
|
|
|
|
|
def get_groups_set(self, remove_existing=True):
|
|
|
|
def get_groups_set(self, remove_existing=True):
|
|
|
|