From c144ea6feff2a712e4862f4e3c2fa882309da5b8 Mon Sep 17 00:00:00 2001 From: Martin Basti Date: Fri, 10 Jul 2015 14:47:59 +0200 Subject: [PATCH] Stageusedr-activate: show username instead of DN If activate user already exists, show name of this user in error message instead of user DN. Error message reworder to keep the same format as stageuser-add, user-add. https://fedorahosted.org/freeipa/ticket/5038 Reviewed-By: David Kupka --- ipalib/plugins/stageuser.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ipalib/plugins/stageuser.py b/ipalib/plugins/stageuser.py index 35e636ded..6cbc8f4ab 100644 --- a/ipalib/plugins/stageuser.py +++ b/ipalib/plugins/stageuser.py @@ -682,8 +682,9 @@ class stageuser_activate(LDAPQuery): active_dn, ['dn'] ) assert isinstance(staging_dn, DN) - raise errors.DuplicateEntry(message=_('Active user %(user)s already exists') % dict( - user=test_entry_attrs.dn)) + raise errors.DuplicateEntry( + message=_('active user with name "%(user)s" already exists') % + dict(user=args[-1])) except errors.NotFound: pass