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

Semantic

Browse source
This commit is contained in:
Alexandre Aubin 2023-02-20 17:50:11 +01:00
parent 290d627faf
commit 890b8e8082
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/app.py
View file

@ -713,7 +713,7 @@ def app_upgrade(app=[], url=None, file=None, force=False, no_safety_backup=False
app_instance_name, app_instance_name,
workdir=extracted_app_folder, workdir=extracted_app_folder,
action="upgrade", action="upgrade",
include_app_settings=True, force_include_app_settings=True,
) )
env_dict.update(env_dict_more) env_dict.update(env_dict_more)
@ -2798,7 +2798,7 @@ def _make_environment_for_app_script(
args_prefix="APP_ARG_", args_prefix="APP_ARG_",
workdir=None, workdir=None,
action=None, action=None,
include_app_settings=False, force_include_app_settings=False,
): ):
app_setting_path = os.path.join(APPS_SETTING_PATH, app) app_setting_path = os.path.join(APPS_SETTING_PATH, app)
@ -2825,7 +2825,7 @@ def _make_environment_for_app_script(
env_dict[f"YNH_{args_prefix}{arg_name_upper}"] = str(arg_value) env_dict[f"YNH_{args_prefix}{arg_name_upper}"] = str(arg_value)
# If packaging format v2, load all settings # If packaging format v2, load all settings
if manifest["packaging_format"] >= 2 or include_app_settings: if manifest["packaging_format"] >= 2 or force_include_app_settings:
env_dict["app"] = app env_dict["app"] = app
for setting_name, setting_value in _get_app_settings(app).items(): for setting_name, setting_value in _get_app_settings(app).items():
# Ignore special internal settings like checksum__ # Ignore special internal settings like checksum__

2
src/utils/resources.py
View file

@ -215,7 +215,7 @@ class AppResource:
self.app, self.app,
workdir=tmpdir, workdir=tmpdir,
action=f"{action}_{self.type}", action=f"{action}_{self.type}",
include_app_settings=True, force_include_app_settings=True,
) )
env_.update(env) env_.update(env)