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

Add return value in hook_exec

Browse source
This commit is contained in:
Josué Tille 2018-08-26 12:46:42 +02:00
parent dfd1a8b1a6
commit 70d0f8a68f
1 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/yunohost/hook.py
View file

@ -280,8 +280,8 @@ def hook_callback(action, hooks=[], args=None, no_trace=False, chdir=None,
try: try:
hook_args = pre_callback(name=name, priority=priority, hook_args = pre_callback(name=name, priority=priority,
path=path, args=args) path=path, args=args)
hook_exec(path, args=hook_args, chdir=chdir, env=env, hook_return = hook_exec(path, args=hook_args, chdir=chdir, env=env,
no_trace=no_trace, raise_on_error=True, user="root") no_trace=no_trace, raise_on_error=True, user="root")[1]
except MoulinetteError as e: except MoulinetteError as e:
state = 'failed' state = 'failed'
logger.error(e.strerror, exc_info=1) logger.error(e.strerror, exc_info=1)
@ -294,6 +294,10 @@ def hook_callback(action, hooks=[], args=None, no_trace=False, chdir=None,
result[state][name].append(path) result[state][name].append(path)
except KeyError: except KeyError:
result[state][name] = [path] result[state][name] = [path]
try:
result['stdreturn'].append(hook_return)
except KeyError:
result['stdreturn'] = [hook_return]
return result return result
@ -341,6 +345,11 @@ def hook_exec(path, args=None, raise_on_error=False, no_trace=False,
stdinfo = os.path.join(tempfile.mkdtemp(), "stdinfo") stdinfo = os.path.join(tempfile.mkdtemp(), "stdinfo")
env['YNH_STDINFO'] = stdinfo env['YNH_STDINFO'] = stdinfo
stdreturn = os.path.join(tempfile.mkdtemp(), "stdreturn")
with open(stdreturn, 'w') as f:
f.write('')
env['YNH_STDRETURN'] = stdreturn
# Construct command to execute # Construct command to execute
if user == "root": if user == "root":
command = ['sh', '-c'] command = ['sh', '-c']
@ -388,11 +397,18 @@ def hook_exec(path, args=None, raise_on_error=False, no_trace=False,
errno.EIO, m18n.n('hook_exec_not_terminated', path=path)) errno.EIO, m18n.n('hook_exec_not_terminated', path=path))
else: else:
logger.error(m18n.n('hook_exec_not_terminated', path=path)) logger.error(m18n.n('hook_exec_not_terminated', path=path))
return 1 return 1, ''
elif raise_on_error and returncode != 0: elif raise_on_error and returncode != 0:
raise MoulinetteError( raise MoulinetteError(
errno.EIO, m18n.n('hook_exec_failed', path=path)) errno.EIO, m18n.n('hook_exec_failed', path=path))
return returncode
with open(stdreturn, 'r') as f:
returnstring = f.read()
stdreturndir = os.path.split(stdreturn)[0]
os.remove(stdreturn)
os.rmdir(stdreturndir)
return returncode, returnstring
def _extract_filename_parts(filename): def _extract_filename_parts(filename):