sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-25 00:59:11 +03:00
Code Activity

s4-samba-tool: fixed exception handling in subcommands

Browse Source 
this switches to the new pattern of:

 except Exception, e:
 	raise CommandError("some error message", e)
This commit is contained in:
Andrew Tridgell
2010-11-29 14:15:57 +11:00
parent 6250690310
commit 37bfc4ec38
13 changed files with 68 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source4/scripting/python/samba/netcmd/group.py
View File

@ -83,9 +83,8 @@ class cmd_group_add(Command):
credentials=creds, lp=lp)
samdb.newgroup(groupname, groupou=groupou, grouptype = gtype,
description=description, mailaddress=mail_address, notes=notes)
except ldb.LdbError, (num, msg):
raise CommandError('Failed to create group "%s" : %s' % (
groupname, msg))
except Exception, e:
raise CommandError('Failed to create group "%s"' % groupname, e)
class cmd_group_delete(Command):
@ -114,9 +113,8 @@ class cmd_group_delete(Command):
samdb = SamDB(url=H, session_info=system_session(),
credentials=creds, lp=lp)
samdb.deletegroup(groupname)
except ldb.LdbError, (num, msg):
raise CommandError('Failed to remove group "%s": %s' % (
groupname , msg))
except Exception, e:
raise CommandError('Failed to remove group "%s"' % groupname, e)
class cmd_group_add_members(Command):
@ -146,9 +144,8 @@ class cmd_group_add_members(Command):
samdb = SamDB(url=H, session_info=system_session(),
credentials=creds, lp=lp)
samdb.add_remove_group_members(groupname, listofmembers, add_members_operation=True)
except ldb.LdbError, (num, msg):
raise CommandError('Failed to add members "%s" to group "%s": %s' % (
listofmembers, groupname , msg))
except Exception, e:
raise CommandError('Failed to add members "%s" to group "%s"' % (listofmembers, groupname), e)
class cmd_group_remove_members(Command):
@ -178,9 +175,8 @@ class cmd_group_remove_members(Command):
samdb = SamDB(url=H, session_info=system_session(),
credentials=creds, lp=lp)
samdb.add_remove_group_members(groupname, listofmembers, add_members_operation=False)
except ldb.LdbError, (num, msg):
raise CommandError('Failed to remove members "%s" from group "%s": %s' % (
listofmembers, groupname , msg))
except Exception, e:
raise CommandError('Failed to remove members "%s" from group "%s"' % (listofmembers, groupname), e)
class cmd_group(SuperCommand):