diff options
author | David Kupka <dkupka@redhat.com> | 2015-08-13 08:11:38 +0200 |
---|---|---|
committer | Martin Basti <mbasti@redhat.com> | 2015-08-18 19:27:01 +0200 |
commit | 6005dfb5857af5ae46efd2984b06a9a35efb7917 (patch) | |
tree | 9348d11b1fb0fa8eaa2a6b7cb1f8b34f4be4fc1e | |
parent | c30baa9bb9dfa5a5de7685e9203f3eae95dec22a (diff) | |
download | freeipa-6005dfb5857af5ae46efd2984b06a9a35efb7917.tar.gz freeipa-6005dfb5857af5ae46efd2984b06a9a35efb7917.tar.xz freeipa-6005dfb5857af5ae46efd2984b06a9a35efb7917.zip |
user-undel: Fix error messages.
https://fedorahosted.org/freeipa/ticket/5207
Reviewed-By: Martin Basti <mbasti@redhat.com>
-rw-r--r-- | ipalib/plugins/user.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/ipalib/plugins/user.py b/ipalib/plugins/user.py index 90ae7260a..418c51bda 100644 --- a/ipalib/plugins/user.py +++ b/ipalib/plugins/user.py @@ -827,16 +827,14 @@ class user_undel(LDAPQuery): # First check that the user exists and is a delete one delete_dn = self.obj.get_either_dn(*keys, **options) - if delete_dn.endswith(DN(self.obj.active_container_dn, api.env.basedn)): - raise errors.ValidationError( - name=self.obj.primary_key.cli_name, - error=_('User %r is already active') % keys[-1][0]) try: entry_attrs = self._exc_wrapper(keys, options, ldap.get_entry)(delete_dn) except errors.NotFound: - raise errors.ValidationError( - name=self.obj.primary_key.cli_name, - error=_('User %r not found') % keys[-1][0]) + self.obj.handle_not_found(*keys) + if delete_dn.endswith(DN(self.obj.active_container_dn, + api.env.basedn)): + raise errors.InvocationError( + message=_('user "%s" is already active') % keys[-1]) active_dn = DN(delete_dn[0], self.obj.active_container_dn, api.env.basedn) |