From ff4152539b96d309dcceaf854a3e0a49f435acff Mon Sep 17 00:00:00 2001 From: Florence Blanc-Renaud Date: Mon, 20 Jun 2022 09:09:11 +0200 Subject: [PATCH] Preserve user: fix the confusing summary When ipa user-del --preserve is called, the command output prints a summary with: Deleted user: user1 although the user was preserved. Replace the summary with Preserved user: user1 to reflect what was actually done. Fixes: https://pagure.io/freeipa/issue/9187 Signed-off-by: Florence Blanc-Renaud Reviewed-By: Michal Polovka Reviewed-By: Rob Crittenden --- ipaserver/plugins/user.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ipaserver/plugins/user.py b/ipaserver/plugins/user.py index 25d2bb6aa..fa8a67d3d 100644 --- a/ipaserver/plugins/user.py +++ b/ipaserver/plugins/user.py @@ -56,6 +56,7 @@ from .idviews import remove_ipaobject_overrides from ipalib.plugable import Registry from .baseldap import ( LDAPObject, + pkey_to_unicode, pkey_to_value, LDAPCreate, LDAPSearch, @@ -701,6 +702,7 @@ class user_del(baseuser_del): __doc__ = _('Delete a user.') msg_summary = _('Deleted user "%(value)s"') + msg_summary_preserved = _('Preserved user "%(value)s"') takes_options = baseuser_del.takes_options + ( Bool('preserve?', @@ -831,6 +833,8 @@ class user_del(baseuser_del): failed.append(pkey_to_value(pkey, options)) val = dict(result=dict(failed=failed), value=preserved) + val['summary'] = self.msg_summary_preserved % dict( + value=pkey_to_unicode(preserved)) return val else: return super(user_del, self).execute(*keys, **options)