diff --git a/debian/changelog b/debian/changelog index b911ccb38..6f79734eb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -185,6 +185,13 @@ yunohost (11.0.2) testing; urgency=low -- Alexandre Aubin Wed, 19 Jan 2022 20:52:39 +0100 +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) + + -- 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) diff --git a/helpers/apt b/helpers/apt index 02c3a0ab7..1ff602b08 100644 --- a/helpers/apt +++ b/helpers/apt @@ -361,6 +361,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 + then + apt-mark unhold ${dep_app}-ynh-deps + fi + ynh_package_autopurge ${dep_app}-ynh-deps # Remove the fake package and its dependencies if they not still used. } diff --git a/src/migrations/0021_migrate_to_bullseye.py b/src/migrations/0021_migrate_to_bullseye.py index 6b1d7c30b..e3e4ddcc8 100644 --- a/src/migrations/0021_migrate_to_bullseye.py +++ b/src/migrations/0021_migrate_to_bullseye.py @@ -393,9 +393,10 @@ 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: + # Have > 70 MB free space on /var/ ? + if free_space_in_directory("/boot/") / (1024**2) < 70.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/.", + "/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, )