sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-04 08:22:08 +03:00
Code Activity

samba.upgrade: Use list comprehension.

Browse Source 
Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Wed Oct 12 22:44:40 CEST 2011 on sn-devel-104
This commit is contained in:
Jelmer Vernooij
2011-10-12 20:12:26 +02:00
parent bd260f03ab
commit c6481f4f24
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source4/scripting/python/samba/upgrade.py
View File

@ -602,8 +602,8 @@ Please fix this account before attempting to upgrade again
logger.info("Next rid = %d", next_rid) logger.info("Next rid = %d", next_rid)
# Check for same username/groupname # Check for same username/groupname
group_names = set(map(lambda g: g.nt_name, grouplist)) group_names = set([g.nt_name for g in grouplist])
user_names = set(map(lambda u: u['account_name'], userlist)) user_names = set([u['account_name'] for u in userlist])
common_names = group_names.intersection(user_names) common_names = group_names.intersection(user_names)
if common_names: if common_names:
logger.error("Following names are both user names and group names:") logger.error("Following names are both user names and group names:")
@ -612,8 +612,8 @@ Please fix this account before attempting to upgrade again
raise ProvisioningError("Please remove common user/group names before upgrade.") raise ProvisioningError("Please remove common user/group names before upgrade.")
# Check for same user sid/group sid # Check for same user sid/group sid
group_sids = set(map(lambda g: str(g.sid), grouplist)) group_sids = set([str(g.sid) for g in grouplist])
user_sids = set(map(lambda u: "%s-%u" % (domainsid, u['rid']), userlist)) user_sids = set(["%s-%u" % (domainsid, u['rid']) for u in userlist])
common_sids = group_sids.intersection(user_sids) common_sids = group_sids.intersection(user_sids)
if common_sids: if common_sids:
logger.error("Following sids are both user and group sids:") logger.error("Following sids are both user and group sids:")