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

s4-s3-upgrade Handle expected errors, error out on unexpected ones

Browse Source 
Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Wed Sep  7 02:22:56 CEST 2011 on sn-devel-104
This commit is contained in:
Andrew Bartlett
2011-09-06 08:14:35 +10:00
parent 02da47d75c
commit a9a3a79767
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -208,10 +208,12 @@ def add_users_to_group(samdb, group, members, logger):
try:
samdb.modify(m)
except ldb.LdbError, (ecode, emsg):
if ecode == ldb.ERR_NO_SUCH_OBJECT:
logger.warn("Could not add member '%s' to group '%s' as either group or user record doesn't exist: %s", member_sid, group.sid, emsg)
if ecode == ldb.ERR_ENTRY_ALREADY_EXISTS:
logger.info("skipped re-adding member '%s' to group '%s': %s", member_sid, group.sid, emsg)
elif ecode == ldb.ERR_NO_SUCH_OBJECT:
raise ProvisioningError("Could not add member '%s' to group '%s' as either group or user record doesn't exist: %s" % (member_sid, group.sid, emsg))
else:
logger.warn("Could not add member '%s' to group '%s': %s", member_sid, group.sid, emsg)
raise ProvisioningError("Could not add member '%s' to group '%s': %s" % (member_sid, group.sid, emsg))
def import_wins(samba4_winsdb, samba3_winsdb):