diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2011-01-07 11:17:55 -0500 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2011-01-10 10:32:10 -0500 |
| commit | 6f58f38748085e6a104de6f9e992469d3b685d5a (patch) | |
| tree | ebc3a92f95feae19afc8ababcf306782e62988f8 /ipalib/plugins | |
| parent | 0a79836082b897ebf734d9073583769cb276937c (diff) | |
| download | freeipa-6f58f38748085e6a104de6f9e992469d3b685d5a.tar.gz freeipa-6f58f38748085e6a104de6f9e992469d3b685d5a.tar.xz freeipa-6f58f38748085e6a104de6f9e992469d3b685d5a.zip | |
Display the entries that failed when deleting with --continue.
We collected the failures but didn't report it back. This changes the
API of most delete commands so rather than returning a boolean it returns
a dict with the only current key as failed.
This also adds a new parameter flag, suppress_empty. This will try to
not print values that are empty if included. This makes the output of
the delete commands a bit prettier.
ticket 687
Diffstat (limited to 'ipalib/plugins')
| -rw-r--r-- | ipalib/plugins/aci.py | 2 | ||||
| -rw-r--r-- | ipalib/plugins/baseldap.py | 8 | ||||
| -rw-r--r-- | ipalib/plugins/delegation.py | 2 | ||||
| -rw-r--r-- | ipalib/plugins/selfservice.py | 2 |
4 files changed, 9 insertions, 5 deletions
diff --git a/ipalib/plugins/aci.py b/ipalib/plugins/aci.py index 0193be5db..939fe535a 100644 --- a/ipalib/plugins/aci.py +++ b/ipalib/plugins/aci.py @@ -473,7 +473,7 @@ class aci_del(crud.Delete): Delete ACI. """ INTERNAL = True - has_output = output.standard_delete + has_output = output.standard_boolean msg_summary = _('Deleted ACI "%(value)s"') def execute(self, aciname, **kw): diff --git a/ipalib/plugins/baseldap.py b/ipalib/plugins/baseldap.py index ecc3fd0b9..fbe4fcece 100644 --- a/ipalib/plugins/baseldap.py +++ b/ipalib/plugins/baseldap.py @@ -136,6 +136,10 @@ global_output_params = ( Str('memberuser', label=_('Failed users/groups'), ), + Str('failed', + label=_('Failed to remove'), + flags=['suppress_empty'], + ), ) @@ -937,8 +941,8 @@ class LDAPDelete(LDAPMultiQuery): deleted.append(pkey) if self.obj.primary_key and pkeyiter[0] is not None: - return dict(result=result, value=u','.join(deleted)) - return dict(result=result, value=u'') + return dict(result=dict(failed=u','.join(failed)), value=u','.join(deleted)) + return dict(result=dict(failed=u''), value=u'') def pre_callback(self, ldap, dn, *keys, **options): return dn diff --git a/ipalib/plugins/delegation.py b/ipalib/plugins/delegation.py index 6ed224421..19d4c6da6 100644 --- a/ipalib/plugins/delegation.py +++ b/ipalib/plugins/delegation.py @@ -174,7 +174,7 @@ class delegation_del(crud.Delete): Delete a delegation. """ - has_output = output.standard_delete + has_output = output.standard_boolean msg_summary = _('Deleted delegation "%(value)s"') def execute(self, aciname, **kw): diff --git a/ipalib/plugins/selfservice.py b/ipalib/plugins/selfservice.py index b5f754ee8..adf6acb79 100644 --- a/ipalib/plugins/selfservice.py +++ b/ipalib/plugins/selfservice.py @@ -134,7 +134,7 @@ class selfservice_del(crud.Delete): Delete a selfservice. """ - has_output = output.standard_delete + has_output = output.standard_boolean msg_summary = _('Deleted selfservice "%(value)s"') def execute(self, aciname, **kw): |