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

Merge branch 'dev' into bullseye

Browse source
This commit is contained in:
Alexandre Aubin 2021-10-02 20:46:36 +02:00
commit 38ea29afd1
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/yunohost/app.py
View file

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