From ac9341245af38fe019c43ad9e413dbc62e26bc7a Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Wed, 19 May 2010 00:26:56 +0200 Subject: pynet: Raise proper exceptions rather than invoking sys.exit. --- source4/scripting/python/samba/netcmd/newuser.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 9ffc0e65254..bb5537aaf02 100644 --- a/source4/scripting/python/samba/netcmd/newuser.py +++ b/source4/scripting/python/samba/netcmd/newuser.py @@ -20,8 +20,8 @@ # along with this program. If not, see . import samba.getopt as options -from samba.netcmd import Command, Option -import sys, ldb +from samba.netcmd import Command, CommandError, Option +import ldb from getpass import getpass from samba.auth import system_session @@ -61,6 +61,6 @@ class cmd_newuser(Command): samdb.newuser(username, password, force_password_change_at_next_login_req=must_change_at_next_login) except ldb.LdbError, (num, msg): - print('Failed to create user "%s" : %s' % (username, msg)) - sys.exit(1) + raise CommandError('Failed to create user "%s" : %s' % ( + username, msg)) -- cgit