[SCM] Samba Shared Repository - branch master updated
Jelmer Vernooij
jelmer at samba.org
Wed Oct 12 14:45:03 MDT 2011
The branch, master has been updated
via c6481f4 samba.upgrade: Use list comprehension.
from bd260f0 Fix bug #8515 - Empty CIFS share can be blocked for other clients by deleting it via empty path (DELETE_PENDING until the last client)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit c6481f4f2491ba76f2da7fdb67bc2264b5b83f12
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Oct 12 20:12:26 2011 +0200
samba.upgrade: Use list comprehension.
Autobuild-User: Jelmer Vernooij <jelmer at samba.org>
Autobuild-Date: Wed Oct 12 22:44:40 CEST 2011 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
source4/scripting/python/samba/upgrade.py | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py
index 53ae93a..b41ab77 100644
--- a/source4/scripting/python/samba/upgrade.py
+++ b/source4/scripting/python/samba/upgrade.py
@@ -602,8 +602,8 @@ Please fix this account before attempting to upgrade again
logger.info("Next rid = %d", next_rid)
# Check for same username/groupname
- group_names = set(map(lambda g: g.nt_name, grouplist))
- user_names = set(map(lambda u: u['account_name'], userlist))
+ group_names = set([g.nt_name for g in grouplist])
+ user_names = set([u['account_name'] for u in userlist])
common_names = group_names.intersection(user_names)
if common_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.")
# Check for same user sid/group sid
- group_sids = set(map(lambda g: str(g.sid), grouplist))
- user_sids = set(map(lambda u: "%s-%u" % (domainsid, u['rid']), userlist))
+ group_sids = set([str(g.sid) for g in grouplist])
+ user_sids = set(["%s-%u" % (domainsid, u['rid']) for u in userlist])
common_sids = group_sids.intersection(user_sids)
if common_sids:
logger.error("Following sids are both user and group sids:")
--
Samba Shared Repository
More information about the samba-cvs
mailing list