From 5a3911c65f0f7bfd509a13d901502351cec71742 Mon Sep 17 00:00:00 2001 From: ljf Date: Sun, 7 Aug 2022 15:26:54 +0200 Subject: [PATCH] [enh] Split bullseye migration and venv migrations --- .../0021_migrate_to_bullseye.py | 39 ++++--------------- 1 file changed, 7 insertions(+), 32 deletions(-) diff --git a/src/yunohost/data_migrations/0021_migrate_to_bullseye.py b/src/yunohost/data_migrations/0021_migrate_to_bullseye.py index 7dc0f39aa..93ff2f930 100644 --- a/src/yunohost/data_migrations/0021_migrate_to_bullseye.py +++ b/src/yunohost/data_migrations/0021_migrate_to_bullseye.py @@ -5,7 +5,7 @@ from moulinette import m18n from yunohost.utils.error import YunohostError from moulinette.utils.log import getActionLogger from moulinette.utils.process import check_output, call_async_output -from moulinette.utils.filesystem import read_file, rm, write_to_file, cp +from moulinette.utils.filesystem import read_file, rm, write_to_file from yunohost.tools import ( Migration, @@ -30,7 +30,7 @@ N_CURRENT_YUNOHOST = 4 N_NEXT_DEBAN = 11 N_NEXT_YUNOHOST = 11 -VENV_REQUIREMENTS_SUFFIX = "_req.txt" +VENV_REQUIREMENTS_SUFFIX = ".requirements_backup_for_bullseye_upgrade.txt" VENV_IGNORE = "ynh_migration_no_regen" @@ -72,26 +72,6 @@ def _generate_requirements(): os.system(f"{venv}/bin/pip freeze > {venv}{VENV_REQUIREMENTS_SUFFIX}") -def _rebuild_venvs(): - """ - After the update, recreate a python virtual env based on the previously generated requirements file - """ - - venvs = _get_all_venvs("/opt/") + _get_all_venvs("/var/www/") - for venv in venvs: - if os.path.isfile(venv + VENV_REQUIREMENTS_SUFFIX): - # Recreate the venv - rm(venv, recursive=True) - os.system(f"python -m venv {venv}") - status = os.system(f"{venv}/bin/pip install -r {venv}{VENV_REQUIREMENTS_SUFFIX}") - if status != 0: - logger.warning(m18n.n("migration_0021_venv_regen_failed", venv=venv)) - else: - rm(venv + VENV_REQUIREMENTS_SUFFIX) - else: - logger.warning(m18n.n("migration_0021_venv_regen_failed", venv=venv)) - - class MyMigration(Migration): "Upgrade the system to Debian Bullseye and Yunohost 11.x" @@ -331,11 +311,6 @@ class MyMigration(Migration): tools_upgrade(target="system", postupgradecmds=postupgradecmds) - # - # Recreate the venvs - # - - _rebuild_venvs() def debian_major_version(self): # The python module "platform" and lsb_release are not reliable because @@ -380,11 +355,11 @@ class MyMigration(Migration): # Lime2 have hold packages to avoid ethernet instability # See https://github.com/YunoHost/arm-images/commit/b4ef8c99554fd1a122a306db7abacc4e2f2942df lime2_hold_packages = set([ - "armbian-firmware", - "armbian-bsp-cli-lime2", - "linux-dtb-current-sunxi", - "linux-image-current-sunxi", - "linux-u-boot-lime2-current", + "armbian-firmware", + "armbian-bsp-cli-lime2", + "linux-dtb-current-sunxi", + "linux-image-current-sunxi", + "linux-u-boot-lime2-current", "linux-image-next-sunxi" ]) if upgradable_system_packages - lime2_hold_packages: