diff --git a/src/yunohost/app.py b/src/yunohost/app.py index 24229571d..e0467d7a7 100644 --- a/src/yunohost/app.py +++ b/src/yunohost/app.py @@ -490,8 +490,7 @@ def app_change_url(auth, app, domain, path): # XXX journal if hook_exec(os.path.join(APP_TMP_FOLDER, 'scripts/change_url'), - args=args_list, env=env_dict, user="root", - enable_stdinfo=True) != 0: + args=args_list, env=env_dict, user="root") != 0: logger.error("Failed to change '%s' url." % app) # restore values modified by app_checkurl @@ -606,8 +605,7 @@ def app_upgrade(auth, app=[], url=None, file=None): # Execute App upgrade script os.system('chown -hR admin: %s' % INSTALL_TMP) if hook_exec(extracted_app_folder + '/scripts/upgrade', - args=args_list, env=env_dict, user="root", - enable_stdinfo=True) != 0: + args=args_list, env=env_dict, user="root") != 0: logger.error(m18n.n('app_upgrade_failed', app=app_instance_name)) else: now = int(time.time()) @@ -742,7 +740,7 @@ def app_install(auth, app, label=None, args=None, no_remove_on_failure=False): try: install_retcode = hook_exec( os.path.join(extracted_app_folder, 'scripts/install'), - args=args_list, env=env_dict, user="root", enable_stdinfo=True) + args=args_list, env=env_dict, user="root") except (KeyboardInterrupt, EOFError): install_retcode = -1 except: @@ -759,8 +757,7 @@ def app_install(auth, app, label=None, args=None, no_remove_on_failure=False): # Execute remove script remove_retcode = hook_exec( os.path.join(extracted_app_folder, 'scripts/remove'), - args=[app_instance_name], env=env_dict_remove, user="root", - enable_stdinfo=True) + args=[app_instance_name], env=env_dict_remove, user="root") if remove_retcode != 0: logger.warning(m18n.n('app_not_properly_removed', app=app_instance_name)) @@ -832,7 +829,7 @@ def app_remove(auth, app): env_dict["YNH_APP_INSTANCE_NUMBER"] = str(app_instance_nb) if hook_exec('/tmp/yunohost_remove/scripts/remove', args=args_list, - env=env_dict, user="root", enable_stdinfo=True) == 0: + env=env_dict, user="root") == 0: logger.success(m18n.n('app_removed', app=app)) if os.path.exists(app_setting_path): diff --git a/src/yunohost/hook.py b/src/yunohost/hook.py index 489cebd5d..94ba0de16 100644 --- a/src/yunohost/hook.py +++ b/src/yunohost/hook.py @@ -298,7 +298,7 @@ def hook_callback(action, hooks=[], args=None, no_trace=False, chdir=None, def hook_exec(path, args=None, raise_on_error=False, no_trace=False, - chdir=None, env=None, user="admin", enable_stdinfo=False): + chdir=None, env=None, user="admin"): """ Execute hook from a file with arguments @@ -337,11 +337,8 @@ def hook_exec(path, args=None, raise_on_error=False, no_trace=False, env = {} env['YNH_CWD'] = chdir - if enable_stdinfo: - stdinfo = os.path.join(tempfile.mkdtemp(), "stdinfo") - env['YNH_STDINFO'] = stdinfo - else: - stdinfo = None + stdinfo = os.path.join(tempfile.mkdtemp(), "stdinfo") + env['YNH_STDINFO'] = stdinfo # Construct command to execute if user == "root":