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

migrate_to_bullseye: fix typo + reorganize a couple steps

Browse source
This commit is contained in:
Alexandre Aubin 2022-01-05 17:45:23 +01:00
parent 3cc1a0a59d
commit 17ad3c8581
1 changed files with 31 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
src/yunohost/data_migrations/0021_migrate_to_bullseye.py
View file

@ -97,23 +97,6 @@ class MyMigration(Migration):
os.system("mv /home/yunohost.conf /var/cache/yunohost/regenconf") os.system("mv /home/yunohost.conf /var/cache/yunohost/regenconf")
rm("/home/yunohost.conf", recursive=True, force=True) rm("/home/yunohost.conf", recursive=True, force=True)
#
# Main upgrade
#
logger.info(m18n.n("migration_0021_main_upgrade"))
apps_packages = self.get_apps_equivs_packages()
self.hold(apps_packages)
tools_upgrade(target="system", allow_yunohost_upgrade=False)
if self.debian_major_version() == N_CURRENT_DEBIAN:
raise YunohostError("migration_0021_still_on_buster_after_main_upgrade")
# Clean the mess
logger.info(m18n.n("migration_0021_cleaning_up"))
os.system("apt autoremove --assume-yes")
os.system("apt clean --assume-yes")
# Force add sury if it's not there yet # Force add sury if it's not there yet
# This is to solve some weird issue with php-common breaking php7.3-common, # This is to solve some weird issue with php-common breaking php7.3-common,
# hence breaking many php7.3-deps # hence breaking many php7.3-deps
@ -128,7 +111,24 @@ class MyMigration(Migration):
'wget --timeout 900 --quiet "https://packages.sury.org/php/apt.gpg" --output-document=- | gpg --dearmor >"/etc/apt/trusted.gpg.d/extra_php_version.gpg"' 'wget --timeout 900 --quiet "https://packages.sury.org/php/apt.gpg" --output-document=- | gpg --dearmor >"/etc/apt/trusted.gpg.d/extra_php_version.gpg"'
) )
os.system("apt update") # Remove legacy postgresql service record added by helpers,
# will now be dynamically handled by the core in bullseye
services = _get_services()
if "postgresql" in services:
del services["postgresql"]
_save_services(services)
#
# Main upgrade
#
logger.info(m18n.n("migration_0021_main_upgrade"))
apps_packages = self.get_apps_equivs_packages()
self.hold(apps_packages)
tools_upgrade(target="system", allow_yunohost_upgrade=False)
if self.debian_major_version() == N_CURRENT_DEBIAN:
raise YunohostError("migration_0021_still_on_buster_after_main_upgrade")
# Force explicit install of php7.4-fpm and other old 'default' dependencies # Force explicit install of php7.4-fpm and other old 'default' dependencies
# that are now only in Recommends # that are now only in Recommends
@ -174,13 +174,13 @@ class MyMigration(Migration):
"zip", "zip",
] ]
cmd = f""" cmd = "apt show '*-ynh-deps' 2>/dev/null" \
apt show '*-ynh-deps' 2>/dev/null " | grep Depends" \
| grep Depends f" | grep -o -E \"php7.3-({'|'.join(php73packages_suffixes)})\"" \
| grep -o -E "php7.3-({'|'.join(php73packages_suffixes)})"; " | sort | uniq" \
| sort | uniq " | sed 's/php7.3/php7.4/g'" \
| sed 's/php7.3/php7.4/g' " || true"
"""
php74packages_to_install = [ php74packages_to_install = [
"php7.4-fpm", "php7.4-fpm",
"php7.4-common", "php7.4-common",
@ -191,20 +191,19 @@ class MyMigration(Migration):
"php7.4-curl", "php7.4-curl",
"php-php-gettext", "php-php-gettext",
] ]
php74packages_to_install += [ php74packages_to_install += [
f.strip() for f in check_output(cmd).split("\n") if f.strip() f.strip() for f in check_output(cmd).split("\n") if f.strip()
] ]
self.apt_install( self.apt_install(
"{' '.join(php74packages_to_install)} -o Dpkg::Options::='--force-confmiss'" f"{' '.join(php74packages_to_install)} -o Dpkg::Options::='--force-confmiss'"
) )
# Remove legacy postgresql service record added by helpers, # Clean the mess
# will now be dynamically handled by the core in bullseye logger.info(m18n.n("migration_0021_cleaning_up"))
services = _get_services() os.system("apt autoremove --assume-yes")
if "postgresql" in services: os.system("apt clean --assume-yes")
del services["postgresql"]
_save_services(services)
# #
# Yunohost upgrade # Yunohost upgrade