Merge branch 'buster' into dev

debian/changelog

@@ -192,6 +192,12 @@ yunohost (11.0.2) testing; urgency=low
 
  -- Alexandre Aubin <alex.aubin@mailoo.org>  Wed, 19 Jan 2022 20:52:39 +0100
 
+yunohost (4.4.2.10) stable; urgency=low
+
+  - bullseye migration: add proper explanations and advices after the damn 'The distribution is not Buster' message ... (6a594d0e)
+
+ -- Alexandre Aubin <alex.aubin@mailoo.org>  Mon, 22 Aug 2022 10:28:50 +0200
+
 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)

locales/en.json

@@ -490,7 +490,7 @@
     "migration_0021_general_warning": "Please note that this migration is a delicate operation. The YunoHost team did its best to review and test it, but the migration might still break parts of the system or its apps.\n\nTherefore, it is recommended to:\n    - Perform a backup of any critical data or app. More info on https://yunohost.org/backup;\n    - Be patient after launching the migration: Depending on your Internet connection and hardware, it might take up to a few hours for everything to upgrade.",
     "migration_0021_main_upgrade": "Starting main upgrade...",
     "migration_0021_modified_files": "Please note that the following files were found to be manually modified and might be overwritten following the upgrade: {manually_modified_files}",
-    "migration_0021_not_buster": "The current Debian distribution is not Buster!",
+    "migration_0021_not_buster2": "The current Debian distribution is not Buster! If you already ran the Buster->Bullseye migration, then this error is symptomatic of the fact that the migration procedure was not 100% succesful (otherwise YunoHost would have flagged it as completed). It is recommended to investigate what happened with the support team, who will need the **full** log of the `migration, which can be found in Tools > Logs in the webadmin.",
     "migration_0021_not_enough_free_space": "Free space is pretty low in /var/! You should have at least 1GB free to run this migration.",
     "migration_0021_patch_yunohost_conflicts": "Applying patch to workaround conflict issue...",
     "migration_0021_patching_sources_list": "Patching the sources.lists...",
@@ -692,4 +692,4 @@
     "yunohost_installing": "Installing YunoHost...",
     "yunohost_not_installed": "YunoHost is not correctly installed. Please run 'yunohost tools postinstall'",
     "yunohost_postinstall_end_tip": "The post-install completed! To finalize your setup, please consider:\n    - adding a first user through the 'Users' section of the webadmin (or 'yunohost user create <username>' in command-line);\n    - diagnose potential issues through the 'Diagnosis' section of the webadmin (or 'yunohost diagnosis run' in command-line);\n    - reading the 'Finalizing your setup' and 'Getting to know YunoHost' parts in the admin documentation: https://yunohost.org/admindoc."
-}
+}

locales/fr.json

@@ -673,7 +673,7 @@
     "migration_0021_modified_files": "Veuillez noter que les fichiers suivants ont été modifiés manuellement et pourraient être écrasés à la suite de la mise à niveau : {manually_modified_files}",
     "migration_0021_cleaning_up": "Nettoyage du cache et des paquets qui ne sont plus nécessaires...",
     "migration_0021_patch_yunohost_conflicts": "Application du correctif pour contourner le problème de conflit...",
-    "migration_0021_not_buster": "La distribution Debian actuelle n'est pas Buster !",
+    "migration_0021_not_buster2": "La distribution Debian actuelle n'est pas Buster ! Si vous avez déjà effectué la migration Buster->Bullseye, alors cette erreur est symptomatique du fait que la migration n'a pas été terminée correctement à 100% (sinon YunoHost aurait marqué la migration comme terminée). Il est recommandé d'étudier ce qu'il s'est passé avec l'équipe de support, qui aura besoin du log **complet** de la migration, qui peut être retrouvé dans Outils > Journaux dans la webadmin.",
     "migration_description_0021_migrate_to_bullseye": "Mise à niveau du système vers Debian Bullseye et YunoHost 11.x",
     "global_settings_setting_security_ssh_password_authentication": "Autoriser l'authentification par mot de passe pour SSH",
     "domain_config_default_app": "Application par défaut",

src/migrations/0021_migrate_to_bullseye.py

@@ -387,7 +387,7 @@ class MyMigration(Migration):
             not self.debian_major_version() == N_CURRENT_DEBIAN
             and not self.yunohost_major_version() == N_CURRENT_YUNOHOST
         ):
-            raise YunohostError("migration_0021_not_buster")
+            raise YunohostError("migration_0021_not_buster2")
 
         # Have > 1 Go free space on /var/ ?
         if free_space_in_directory("/var/") / (1024**3) < 1.0: