diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-11-29 14:15:57 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-11-29 18:04:42 +1100 |
| commit | 37bfc4ec384df71a4cb1c19ceb136fecd3b9afc6 (patch) | |
| tree | e44efedee115beac377d1fc9ab3a22c5e6cc2cee /source4/scripting/python/samba/netcmd/group.py | |
| parent | 62506903101e8e8e1cfc6c70fee245f97c646844 (diff) | |
| download | samba-37bfc4ec384df71a4cb1c19ceb136fecd3b9afc6.tar.gz samba-37bfc4ec384df71a4cb1c19ceb136fecd3b9afc6.tar.bz2 samba-37bfc4ec384df71a4cb1c19ceb136fecd3b9afc6.zip | |
s4-samba-tool: fixed exception handling in subcommands
this switches to the new pattern of:
except Exception, e:
raise CommandError("some error message", e)
Diffstat (limited to 'source4/scripting/python/samba/netcmd/group.py')
| -rw-r--r-- | source4/scripting/python/samba/netcmd/group.py | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/source4/scripting/python/samba/netcmd/group.py b/source4/scripting/python/samba/netcmd/group.py index 3a467fb28ce..57f31cd511f 100644 --- a/source4/scripting/python/samba/netcmd/group.py +++ b/source4/scripting/python/samba/netcmd/group.py @@ -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): |