YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Don't miserably crash if doveadm fails to run

Browse source
This commit is contained in:
Alexandre Aubin 2020-05-15 17:06:24 +02:00
parent 413778d2bc
commit c9b2213817
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/yunohost/user.py
View file

@ -467,9 +467,14 @@ def user_info(username):
elif username not in user_permission_list(full=True)["permissions"]["mail.main"]["corresponding_users"]: elif username not in user_permission_list(full=True)["permissions"]["mail.main"]["corresponding_users"]:
logger.warning(m18n.n('mailbox_disabled', user=username)) logger.warning(m18n.n('mailbox_disabled', user=username))
else: else:
cmd = 'doveadm -f flow quota get -u %s' % user['uid'][0] try:
cmd_result = subprocess.check_output(cmd, stderr=subprocess.STDOUT, cmd = 'doveadm -f flow quota get -u %s' % user['uid'][0]
shell=True) cmd_result = subprocess.check_output(cmd, stderr=subprocess.STDOUT,
shell=True)
except Exception as e:
cmd_result = ""
logger.warning("Failed to fetch quota info ... : %s " % str(e))
# Exemple of return value for cmd: # Exemple of return value for cmd:
# """Quota name=User quota Type=STORAGE Value=0 Limit=- %=0 # """Quota name=User quota Type=STORAGE Value=0 Limit=- %=0
# Quota name=User quota Type=MESSAGE Value=0 Limit=- %=0""" # Quota name=User quota Type=MESSAGE Value=0 Limit=- %=0"""