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] Define common hooks arguments once in service_regen_conf

Browse source
This commit is contained in:
Jérôme Lebleu 2016-04-19 20:10:02 +02:00
parent b4cbe19865
commit c81393425a
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/yunohost/service.py
View file

@ -302,13 +302,17 @@ def service_regen_conf(names=[], with_diff=False, force=False,
shutil.rmtree(pending_conf_dir, ignore_errors=True) shutil.rmtree(pending_conf_dir, ignore_errors=True)
filesystem.mkdir(pending_conf_dir, 0755, True) filesystem.mkdir(pending_conf_dir, 0755, True)
# Format common hooks arguments
common_args = [1 if force else 0,]
# Execute hooks for pre-regen # Execute hooks for pre-regen
pre_args = ['pre',] + common_args
def _pre_call(name, priority, path, args): def _pre_call(name, priority, path, args):
# create the pending conf directory for the service # create the pending conf directory for the service
service_pending_path = os.path.join(pending_conf_dir, name) service_pending_path = os.path.join(pending_conf_dir, name)
filesystem.mkdir(service_pending_path, 0755, True, uid='admin') filesystem.mkdir(service_pending_path, 0755, True, uid='admin')
# return the arguments to pass to the script # return the arguments to pass to the script
return ['pre', 1 if force else 0, service_pending_path] return pre_args + [service_pending_path,]
pre_result = hook_callback('conf_regen', names, pre_callback=_pre_call) pre_result = hook_callback('conf_regen', names, pre_callback=_pre_call)
# Update the services name # Update the services name
@ -431,15 +435,15 @@ def service_regen_conf(names=[], with_diff=False, force=False,
} }
# Execute hooks for post-regen # Execute hooks for post-regen
post_args = ['post',] + common_args
def _pre_call(name, priority, path, args): def _pre_call(name, priority, path, args):
# append coma-separated applied changes for the service # append coma-separated applied changes for the service
if name in result and result[name]['applied']: if name in result and result[name]['applied']:
args.append(','.join(result[name]['applied'].keys())) regen_conf_files = ','.join(result[name]['applied'].keys())
else: else:
args.append('') regen_conf_files = ''
return args return post_args + [regen_conf_files,]
hook_callback('conf_regen', names, pre_callback=_pre_call, hook_callback('conf_regen', names, pre_callback=_pre_call)
args=['post', 1 if force else 0])
return result return result