summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
d61569d)
When chpoboxing (-c), we get_pobox for each user. moira returns an error for
(some) deactivated users, so we should catch that error and report it inline,
rather than erroring out entirely. This was discovered by rblanche'ing
sipb-prospectives.
return members
def get_and_format_pobox(self, user):
return members
def get_and_format_pobox(self, user):
- result = moira.query('get_pobox', user)[0]
+ try:
+ result = moira.query('get_pobox', user)[0]
+ except moira.MoiraException, e:
+ return "%8s ** moira error: %s **" % (user, e)
if result['type'] == 'SMTP':
fmt = '-> %s'
elif result['type'] == 'SPLIT':
if result['type'] == 'SMTP':
fmt = '-> %s'
elif result['type'] == 'SPLIT':