summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-05-19 00:26:56 +0200
committerJelmer Vernooij <jelmer@samba.org>2010-05-19 19:35:22 +0200
commitac9341245af38fe019c43ad9e413dbc62e26bc7a (patch)
tree1f183291d4f882fd289e8a42cc5748bd8e53f1fe /source4
parentd18fbda0d0bd7d4cd702e1feb80d5803a4afcc39 (diff)
downloadsamba-ac9341245af38fe019c43ad9e413dbc62e26bc7a.tar.gz
samba-ac9341245af38fe019c43ad9e413dbc62e26bc7a.tar.bz2
samba-ac9341245af38fe019c43ad9e413dbc62e26bc7a.zip
pynet: Raise proper exceptions rather than invoking sys.exit.
Diffstat (limited to 'source4')
-rw-r--r--source4/scripting/python/samba/netcmd/newuser.py8
-rw-r--r--source4/scripting/python/samba/netcmd/setpassword.py6
2 files changed, 6 insertions, 8 deletions
diff --git a/source4/scripting/python/samba/netcmd/newuser.py b/source4/scripting/python/samba/netcmd/newuser.py
index 9ffc0e6525..bb5537aaf0 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 <http://www.gnu.org/licenses/>.
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))
diff --git a/source4/scripting/python/samba/netcmd/setpassword.py b/source4/scripting/python/samba/netcmd/setpassword.py
index 098b3cb9b8..d51e8ea42a 100644
--- a/source4/scripting/python/samba/netcmd/setpassword.py
+++ b/source4/scripting/python/samba/netcmd/setpassword.py
@@ -22,7 +22,6 @@
import samba.getopt as options
from samba.netcmd import Command, CommandError, Option
-import sys
from getpass import getpass
from samba.auth import system_session
from samba.samdb import SamDB
@@ -73,6 +72,5 @@ class cmd_setpassword(Command):
force_change_at_next_login=must_change_at_next_login,
username=username)
except:
- print('Failed to set password for user "%s"' % username)
- sys.exit(1)
-
+ raise CommandError('Failed to set password for user "%s"' %
+ username)