From bf3a75cf82f7ccdde14108d0d300b08d764277a3 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 1 Apr 2011 15:59:15 +1100 Subject: s4-samba-tool: give a bit better error on user delete failure --- source4/scripting/python/samba/netcmd/user.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'source4') diff --git a/source4/scripting/python/samba/netcmd/user.py b/source4/scripting/python/samba/netcmd/user.py index bbc972bcc7..a5750b5010 100644 --- a/source4/scripting/python/samba/netcmd/user.py +++ b/source4/scripting/python/samba/netcmd/user.py @@ -24,6 +24,7 @@ from samba.net import Net from samba.netcmd import ( Command, + CommandError, SuperCommand, ) @@ -64,7 +65,10 @@ class cmd_user_delete(Command): lp = sambaopts.get_loadparm() creds = credopts.get_credentials(lp, fallback_machine=True) net = Net(creds, lp, server=credopts.ipaddress) - net.delete_user(name) + try: + net.delete_user(name) + except RuntimeError, msg: + raise CommandError("Failed to delete user %s: %s" % (name, msg)) class cmd_user(SuperCommand): -- cgit