From 3c795f3251bd0354d56e2b50042ee04cee7cd21f Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Wed, 27 Oct 2010 12:07:53 -0400 Subject: Return reason for failure when updating group membership fails. We used to return a list of dns that failed to be added. We now return a list of tuples instead. The tuple looks like (dn, reason) where reason is the exception that was returned. Also made the label we use for failures to be singular instead of plural since we now print them out individually instead of as comma-separated. ticket 270 --- ipalib/plugins/netgroup.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'ipalib/plugins/netgroup.py') diff --git a/ipalib/plugins/netgroup.py b/ipalib/plugins/netgroup.py index 3b714213a..28647b963 100644 --- a/ipalib/plugins/netgroup.py +++ b/ipalib/plugins/netgroup.py @@ -156,13 +156,13 @@ class netgroup_add_member(LDAPAddMember): external_hosts = entry_attrs_.get('externalhost', []) failed_hosts = [] for host in failed['memberhost']['host']: - host = host.lower() - host_dn = self.api.Object['host'].get_dn(host) - if host not in external_hosts and host_dn not in members: - external_hosts.append(host) + hostname = host[0].lower() + host_dn = self.api.Object['host'].get_dn(hostname) + if hostname not in external_hosts and host_dn not in members: + external_hosts.append(hostname) completed_external += 1 else: - failed_hosts.append(host) + failed_hosts.append(hostname) if completed_external: try: ldap.update_entry(dn, {'externalhost': external_hosts}) @@ -190,12 +190,12 @@ class netgroup_remove_member(LDAPRemoveMember): failed_hosts = [] completed_external = 0 for host in failed['memberhost']['host']: - host = host.lower() - if host in external_hosts: - external_hosts.remove(host) + hostname = host[0].lower() + if hostname in external_hosts: + external_hosts.remove(hostname) completed_external += 1 else: - failed_hosts.append(host) + failed_hosts.append(hostname) if completed_external: try: ldap.update_entry(dn, {'externalhost': external_hosts}) -- cgit