skip "whoami" key instead of popping

This commit is contained in:
Daniel STAN 2014-04-24 12:02:05 +02:00
parent 53eb46d652
commit 492d9f664a

View file

@ -495,8 +495,9 @@ def get_recipients_of_roles(options, roles):
"""Renvoie les destinataires d'une liste de rôles""" """Renvoie les destinataires d'une liste de rôles"""
recipients = set() recipients = set()
allroles = all_roles(options) allroles = all_roles(options)
allroles.pop("whoami")
for role in roles: for role in roles:
if role == u"whoami":
continue
for recipient in allroles[role]: for recipient in allroles[role]:
recipients.add(recipient) recipients.add(recipient)
return recipients return recipients
@ -604,6 +605,8 @@ def show_roles(options):
print(u"Liste des roles disponibles".encode("utf-8")) print(u"Liste des roles disponibles".encode("utf-8"))
allroles = all_roles(options) allroles = all_roles(options)
for (role, usernames) in allroles.iteritems(): for (role, usernames) in allroles.iteritems():
if role == u"whoami":
continue
if not role.endswith('-w'): if not role.endswith('-w'):
print((u" * %s : %s" % (role, ", ".join(usernames))).encode("utf-8")) print((u" * %s : %s" % (role, ", ".join(usernames))).encode("utf-8"))