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: do not assume the preserve flags have value in user_del

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

Reviewed-By: David Kupka <dkupka@redhat.com>
This commit is contained in:
Jan Cholasta 2016-05-19 15:09:21 +02:00
parent 3eaafe42b5
commit 213237c7fe
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ipalib/plugins/user.py
View File

@ -674,14 +674,15 @@ class user_del(baseuser_del):
def forward(self, *keys, **options): def forward(self, *keys, **options):
if self.api.env.context == 'cli': if self.api.env.context == 'cli':
if options['no_preserve'] and options['preserve']: no_preserve = options.pop('no_preserve', False)
preserve = options.pop('preserve', False)
if no_preserve and preserve:
raise errors.MutuallyExclusiveError( raise errors.MutuallyExclusiveError(
reason=_("preserve and no-preserve cannot be both set")) reason=_("preserve and no-preserve cannot be both set"))
elif options['no_preserve']: elif no_preserve:
options['preserve'] = False options['preserve'] = False
elif not options['preserve']: elif preserve:
del options['preserve'] options['preserve'] = True
del options['no_preserve']
return super(user_del, self).forward(*keys, **options) return super(user_del, self).forward(*keys, **options)