diff options
| -rw-r--r-- | ipalib/plugins/user.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/ipalib/plugins/user.py b/ipalib/plugins/user.py index adcee2c5b..d4e7e04ef 100644 --- a/ipalib/plugins/user.py +++ b/ipalib/plugins/user.py @@ -674,14 +674,15 @@ class user_del(baseuser_del): def forward(self, *keys, **options): 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( reason=_("preserve and no-preserve cannot be both set")) - elif options['no_preserve']: + elif no_preserve: options['preserve'] = False - elif not options['preserve']: - del options['preserve'] - del options['no_preserve'] + elif preserve: + options['preserve'] = True return super(user_del, self).forward(*keys, **options) |