Merge branch 'dev' into bullseye

This commit is contained in:
Alexandre Aubin 2021-10-02 20:46:36 +02:00
commit 38ea29afd1

View file

@ -62,12 +62,12 @@ from yunohost.utils.i18n import _value_for_locale
from yunohost.utils.error import YunohostError, YunohostValidationError
from yunohost.utils.filesystem import free_space_in_directory
from yunohost.log import is_unit_operation, OperationLogger
from yunohost.app_catalog import (
from yunohost.app_catalog import ( # noqa
app_catalog,
app_search,
_load_apps_catalog,
app_fetchlist,
) # noqa
)
logger = getActionLogger("yunohost.app")
@ -2322,7 +2322,7 @@ def _make_environment_for_app_script(
return env_dict
def _parse_app_instance_name(app_instance_name):
def _parse_app_instance_name(app_instance_name: str) -> Tuple[str, int]:
"""
Parse a Yunohost app instance name and extracts the original appid
and the application instance number