From b306df2c3bed9343c869d5ea19631f321f935375 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Thu, 18 Aug 2022 19:17:48 +0200 Subject: [PATCH 1/5] apt helper: fix edge case with equivs package being flagged hold because of buster->bullseye migration --- data/helpers.d/apt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/data/helpers.d/apt b/data/helpers.d/apt index 490a59f24..10edf23d4 100644 --- a/data/helpers.d/apt +++ b/data/helpers.d/apt @@ -394,6 +394,13 @@ ynh_remove_app_dependencies() { current_dependencies=${current_dependencies// | /|} fi + # Edge case where the app dep may be on hold, + # cf https://forum.yunohost.org/t/migration-error-cause-of-ffsync/20675/4 + if apt-mark showhold | grep -q -w ${dep_app}-ynh-deps + do + apt-mark unhold ${dep_app}-ynh-deps + done + ynh_package_autopurge ${dep_app}-ynh-deps # Remove the fake package and its dependencies if they not still used. # Check if this app used a specific php version ... in which case we check From a2d4abc1f8ef8b3033dcbf472faf2d731aa71681 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Thu, 18 Aug 2022 19:24:34 +0200 Subject: [PATCH 2/5] bullseye migration: fix check about free space in /boot/ ... --- src/yunohost/data_migrations/0021_migrate_to_bullseye.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/yunohost/data_migrations/0021_migrate_to_bullseye.py b/src/yunohost/data_migrations/0021_migrate_to_bullseye.py index 82187fb88..6aa9616ac 100644 --- a/src/yunohost/data_migrations/0021_migrate_to_bullseye.py +++ b/src/yunohost/data_migrations/0021_migrate_to_bullseye.py @@ -373,8 +373,9 @@ class MyMigration(Migration): if free_space_in_directory("/var/") / (1024**3) < 1.0: raise YunohostError("migration_0021_not_enough_free_space") - if free_space_in_directory("/boot/") / (120**3) < 1.0: - raise YunohostError("/boot/ has less than 120MB available. This will probably trigger a crash during the upgrade because a new kernel needs to be installed. Please look for advice on the forum on how to remove old, unused kernels to free up some space in /boot/.", raw_msg=True) + # Have > 70 MB free space on /var/ ? + if free_space_in_directory("/boot/") / (1024**2) < 70.0: + raise YunohostError("/boot/ has less than 70MB available. This will probably trigger a crash during the upgrade because a new kernel needs to be installed. Please look for advice on the forum on how to remove old, unused kernels to free up some space in /boot/.", raw_msg=True) # Check system is up to date # (but we don't if 'bullseye' is already in the sources.list ... From 4a1b31bac4a21c5e1d6e304bddb47015149513a9 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Thu, 18 Aug 2022 19:25:31 +0200 Subject: [PATCH 3/5] Update changelog for 4.4.2.8 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index d8a8b1c19..5e5a608c2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +yunohost (4.4.2.8) stable; urgency=low + + - apt helper: fix edge case with equivs package being flagged hold because of buster->bullseye migration (b306df2c) + - bullseye migration: fix check about free space in /boot/ ... (a2d4abc1) + + -- Alexandre Aubin Thu, 18 Aug 2022 19:24:47 +0200 + yunohost (4.4.2.7) stable; urgency=low - upgrades: ignore boring insserv warnings during apt commands (87f0eff9) From 3706ba3121b815a8e442b7f17ff7fa9e52b8219d Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Fri, 19 Aug 2022 18:30:23 +0200 Subject: [PATCH 4/5] Hmpf --- data/helpers.d/apt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/helpers.d/apt b/data/helpers.d/apt index 10edf23d4..0a1d70004 100644 --- a/data/helpers.d/apt +++ b/data/helpers.d/apt @@ -397,9 +397,9 @@ ynh_remove_app_dependencies() { # Edge case where the app dep may be on hold, # cf https://forum.yunohost.org/t/migration-error-cause-of-ffsync/20675/4 if apt-mark showhold | grep -q -w ${dep_app}-ynh-deps - do + then apt-mark unhold ${dep_app}-ynh-deps - done + fi ynh_package_autopurge ${dep_app}-ynh-deps # Remove the fake package and its dependencies if they not still used. From 9ef7ac7117bcfd1b50628ad493f22e5ba9b4f0c4 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Fri, 19 Aug 2022 18:30:53 +0200 Subject: [PATCH 5/5] Update changelog for 4.4.2.9 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 5e5a608c2..3f0189ad1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -yunohost (4.4.2.8) stable; urgency=low +yunohost (4.4.2.9) stable; urgency=low - apt helper: fix edge case with equivs package being flagged hold because of buster->bullseye migration (b306df2c) - bullseye migration: fix check about free space in /boot/ ... (a2d4abc1)