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/setpassword.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/setpassword.py')
| -rw-r--r-- | source4/scripting/python/samba/netcmd/setpassword.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source4/scripting/python/samba/netcmd/setpassword.py b/source4/scripting/python/samba/netcmd/setpassword.py index 047a95afae2..b32b6518229 100644 --- a/source4/scripting/python/samba/netcmd/setpassword.py +++ b/source4/scripting/python/samba/netcmd/setpassword.py @@ -75,7 +75,6 @@ class cmd_setpassword(Command): samdb.setpassword(filter, password, force_change_at_next_login=must_change_at_next_login, username=username) - except ldb.LdbError, (num, msg): - raise CommandError('Failed to set password for user "%s" - %s' % - (username, msg)) + except Exception, e: + raise CommandError('Failed to set password for user "%s"' % username, e) print "Changed password OK" |