IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

user-undel: Fix error messages.

Browse Source 
https://fedorahosted.org/freeipa/ticket/5207

Reviewed-By: Martin Basti <mbasti@redhat.com>
This commit is contained in:
David Kupka 2015-08-13 08:11:38 +02:00 committed by Martin Basti
parent 3692a1c57f
commit 65b8c62207
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ipalib/plugins/user.py
View File

@ -827,16 +827,14 @@ class user_undel(LDAPQuery):
# First check that the user exists and is a delete one # First check that the user exists and is a delete one
delete_dn = self.obj.get_either_dn(*keys, **options) 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: try:
entry_attrs = self._exc_wrapper(keys, options, ldap.get_entry)(delete_dn) entry_attrs = self._exc_wrapper(keys, options, ldap.get_entry)(delete_dn)
except errors.NotFound: except errors.NotFound:
raise errors.ValidationError( self.obj.handle_not_found(*keys)
name=self.obj.primary_key.cli_name, if delete_dn.endswith(DN(self.obj.active_container_dn,
error=_('User %r not found') % keys[-1][0]) 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) active_dn = DN(delete_dn[0], self.obj.active_container_dn, api.env.basedn)