From ff937705294066999ba2107e8576412a6312a7ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Lebleu?= Date: Fri, 6 May 2016 23:35:09 +0200 Subject: [PATCH] [enh] Add app hooks after the install to allow modifications --- src/yunohost/app.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/yunohost/app.py b/src/yunohost/app.py index 157917a96..9a4214409 100644 --- a/src/yunohost/app.py +++ b/src/yunohost/app.py @@ -507,12 +507,6 @@ def app_install(auth, app, label=None, args=None): shutil.rmtree(app_setting_path) os.makedirs(app_setting_path) - # Clean hooks and add new ones - hook_remove(app_instance_name) - if 'hooks' in os.listdir(app_tmp_folder): - for file in os.listdir(app_tmp_folder +'/hooks'): - hook_add(app_instance_name, app_tmp_folder +'/hooks/'+ file) - # Set initial app settings app_settings = { 'id': app_instance_name, @@ -557,7 +551,6 @@ def app_install(auth, app, label=None, args=None): app=app_instance_name)) # Clean tmp folders - hook_remove(app_instance_name) shutil.rmtree(app_setting_path) shutil.rmtree(app_tmp_folder) @@ -566,6 +559,12 @@ def app_install(auth, app, label=None, args=None): m18n.g('operation_interrupted')) raise MoulinetteError(errno.EIO, m18n.n('installation_failed')) + # Clean hooks and add new ones + hook_remove(app_instance_name) + if 'hooks' in os.listdir(app_tmp_folder): + for file in os.listdir(app_tmp_folder +'/hooks'): + hook_add(app_instance_name, app_tmp_folder +'/hooks/'+ file) + # Store app status with open(app_setting_path + '/status.json', 'w+') as f: json.dump(status, f)