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

Simplify _check_manifest_requirements

Browse source
This commit is contained in:
Alexandre Aubin 2021-10-01 03:33:12 +02:00
parent 5fc493058d
commit 313897d184
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/yunohost/app.py
View file

@ -538,7 +538,7 @@ def app_upgrade(app=[], url=None, file=None, force=False, no_safety_backup=False
upgrade_type = "UPGRADE_FULL" upgrade_type = "UPGRADE_FULL"
# Check requirements # Check requirements
_check_manifest_requirements(manifest, app_instance_name=app_instance_name) _check_manifest_requirements(manifest)
_assert_system_is_sane_for_app(manifest, "pre") _assert_system_is_sane_for_app(manifest, "pre")
app_setting_path = os.path.join(APPS_SETTING_PATH, app_instance_name) app_setting_path = os.path.join(APPS_SETTING_PATH, app_instance_name)
@ -753,7 +753,7 @@ def app_install(
label = label if label else manifest["name"] label = label if label else manifest["name"]
# Check requirements # Check requirements
_check_manifest_requirements(manifest, app_id) _check_manifest_requirements(manifest)
_assert_system_is_sane_for_app(manifest, "pre") _assert_system_is_sane_for_app(manifest, "pre")
# Check if app can be forked # Check if app can be forked
@ -2187,7 +2187,7 @@ def _get_all_installed_apps_id():
return all_apps_ids_formatted return all_apps_ids_formatted
def _check_manifest_requirements(manifest: Dict, app: str): def _check_manifest_requirements(manifest: Dict):
"""Check if required packages are met from the manifest""" """Check if required packages are met from the manifest"""
packaging_format = int(manifest.get("packaging_format", 0)) packaging_format = int(manifest.get("packaging_format", 0))
@ -2199,6 +2199,8 @@ def _check_manifest_requirements(manifest: Dict, app: str):
if not requirements: if not requirements:
return return
app = manifest.get("id", "?")
logger.debug(m18n.n("app_requirements_checking", app=app)) logger.debug(m18n.n("app_requirements_checking", app=app))
# Iterate over requirements # Iterate over requirements