From a592279cd0263e51069838829b2efb73639b6e70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Mon, 26 Jun 2017 11:58:59 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D1=81=D0=BE=D1=80=D1=82=D0=B8=D1=80=D0=BE=D0=B2?= =?UTF-8?q?=D0=BA=D0=B0=20=D0=B3=D1=80=D1=83=D0=BF=D0=BF=20=D0=BF=D0=BE?= =?UTF-8?q?=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pym/install/variables/system.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pym/install/variables/system.py b/pym/install/variables/system.py index 44bba77..a6fab17 100644 --- a/pym/install/variables/system.py +++ b/pym/install/variables/system.py @@ -396,9 +396,9 @@ class VariableClMigrateUserGroups(UserHelper, Variable): Migrate users groups """ type = 'choice-list-list' - defaultGroupList = ["users", "wheel", "audio", "cdrom", "video", + defaultGroupList = sorted(["users", "wheel", "audio", "cdrom", "video", "cdrw", "usb", "plugdev", "games", "lp", "scanner", - "uucp"] + "uucp"]) def getDefaultGroups(self): return list(set(self.defaultGroupList) & set(getGroups())) @@ -423,7 +423,7 @@ class VariableClMigrateUserGroups(UserHelper, Variable): User groups """ passwdList = getPasswdUsers() - return map(lambda x: (self.getPrimaryGroup(x) + + return map(lambda x: sorted(self.getPrimaryGroup(x) + (getUserGroups(x) if x in passwdList else self.getDefaultGroups())), @@ -433,7 +433,7 @@ class VariableClMigrateUserGroups(UserHelper, Variable): """ Available groups """ - return [("", _("Default"))] + [(x, x) for x in getGroups()] + return [("", _("Default"))] + sorted([(x, x) for x in getGroups()]) class VariableClMigrateUserPwd(UserHelper, Variable):