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

idviews: Complain if host is already assigned the ID View in idview-apply

Browse Source 
When running a idview-apply command, the hosts that were already assigned
the desired view were silently ignored. Make sure such hosts show up in
the list of failed hosts.

https://fedorahosted.org/freeipa/ticket/4743

Reviewed-By: Jan Cholasta <jcholast@redhat.com>
Reviewed-By: Petr Vobornik <pvoborni@redhat.com>
This commit is contained in:
Tomas Babej
2014-12-11 07:50:40 +01:00
committed by Petr Vobornik
parent 4b367bc9a7
commit fdd7b79eea
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ipalib/plugins/idviews.py
View File

@@ -260,7 +260,7 @@ class baseidview_apply(LDAPQuery):
try:
hosts_to_apply += get_complete_hostgroup_member_list(hostgroup)
except errors.NotFound:
failed['hostgroup'].append((hostgroup, "not found"))
failed['hostgroup'].append((hostgroup, unicode(_("not found"))))
except errors.PublicError as e:
failed['hostgroup'].append((hostgroup, "%s : %s" % (
e.__class__.__name__, str(e))))
@@ -279,10 +279,11 @@ class baseidview_apply(LDAPQuery):
completed = completed + 1
succeeded['host'].append(host)
except errors.EmptyModlist:
# If view was already applied, do not complain
pass
# If view was already applied, complain about it
failed['host'].append((host,
unicode(_("ID View already applied"))))
except errors.NotFound:
failed['host'].append((host, "not found"))
failed['host'].append((host, unicode(_("not found"))))
except errors.PublicError as e:
failed['host'].append((host, str(e)))