From 37bfc4ec384df71a4cb1c19ceb136fecd3b9afc6 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 29 Nov 2010 14:15:57 +1100 Subject: s4-samba-tool: fixed exception handling in subcommands this switches to the new pattern of: except Exception, e: raise CommandError("some error message", e) --- source4/scripting/python/samba/netcmd/newuser.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'source4/scripting/python/samba/netcmd/newuser.py') diff --git a/source4/scripting/python/samba/netcmd/newuser.py b/source4/scripting/python/samba/netcmd/newuser.py index 693568dee27..05c7bfc1bbf 100644 --- a/source4/scripting/python/samba/netcmd/newuser.py +++ b/source4/scripting/python/samba/netcmd/newuser.py @@ -91,7 +91,6 @@ class cmd_newuser(Command): jobtitle=job_title, department=department, company=company, description=description, mailaddress=mail_address, internetaddress=internet_address, telephonenumber=telephone_number, physicaldeliveryoffice=physical_delivery_office) - except ldb.LdbError, (num, msg): - raise CommandError('Failed to create user "%s" : %s' % ( - username, msg)) + except Exception, e: + raise CommandError('Failed to create user "%s"' % username, e) -- cgit