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

[enh] Allow to set env var for executed hooks in hooks_callback

Browse source
This commit is contained in:
Jérôme Lebleu 2016-04-30 17:15:17 +02:00
parent aae59b1d6e
commit c3fd005027
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/yunohost/hook.py
View file

@ -208,7 +208,7 @@ def hook_list(action, list_by='name', show_info=False):
def hook_callback(action, hooks=[], args=None, no_trace=False, chdir=None, def hook_callback(action, hooks=[], args=None, no_trace=False, chdir=None,
pre_callback=None, post_callback=None): env=None, pre_callback=None, post_callback=None):
""" """
Execute all scripts binded to an action Execute all scripts binded to an action
@ -218,6 +218,7 @@ def hook_callback(action, hooks=[], args=None, no_trace=False, chdir=None,
args -- Ordered list of arguments to pass to the scripts args -- Ordered list of arguments to pass to the scripts
no_trace -- Do not print each command that will be executed no_trace -- Do not print each command that will be executed
chdir -- The directory from where the scripts will be executed chdir -- The directory from where the scripts will be executed
env -- Dictionnary of environment variables to export
pre_callback -- An object to call before each script execution with pre_callback -- An object to call before each script execution with
(name, priority, path, args) as arguments and which must return (name, priority, path, args) as arguments and which must return
the arguments to pass to the script the arguments to pass to the script
@ -276,7 +277,7 @@ 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, hook_exec(path, args=hook_args, chdir=chdir, env=env,
no_trace=no_trace, raise_on_error=True) no_trace=no_trace, raise_on_error=True)
except MoulinetteError as e: except MoulinetteError as e:
state = 'failed' state = 'failed'