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

Fix error if hook return nothing

Browse source
This commit is contained in:
Josué Tille 2018-08-30 17:37:28 +02:00
parent e4e981c0fe
commit 8ec6f2b81a
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/yunohost/hook.py
View file

@ -398,10 +398,15 @@ def hook_exec(path, args=None, raise_on_error=False, no_trace=False,
errno.EIO, m18n.n('hook_exec_failed', path=path)) errno.EIO, m18n.n('hook_exec_failed', path=path))
try: try:
returnjson = read_json(stdreturn) with open(stdreturn, 'r') as f:
if f.read() != '':
returnjson = read_json(stdreturn)
else:
returnjson = {}
except Exception as e: except Exception as e:
returnjson = {} returnjson = {}
errno.EIO, m18n.n('hook_json_return_error', path=path, msg=str(e)) raise MoulinetteError(
errno.EIO, m18n.n('hook_json_return_error', path=path, msg=str(e)))
stdreturndir = os.path.split(stdreturn)[0] stdreturndir = os.path.split(stdreturn)[0]
os.remove(stdreturn) os.remove(stdreturn)