Merge branch 'buster' into dev

This commit is contained in:
Alexandre Aubin 2022-08-26 21:16:05 +02:00
commit 995ea0ca94
2 changed files with 16 additions and 0 deletions

6
debian/changelog vendored
View file

@ -202,6 +202,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.11) stable; urgency=low
- bullseye migration: add trick to automagically find the likely log of a previously failed migration to ease support (f5d94509)
-- Alexandre Aubin <alex.aubin@mailoo.org> Fri, 26 Aug 2022 19:22:30 +0200
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)

View file

@ -387,6 +387,16 @@ class MyMigration(Migration):
not self.debian_major_version() == N_CURRENT_DEBIAN
and not self.yunohost_major_version() == N_CURRENT_YUNOHOST
):
try:
# Here we try to find the previous migration log, which should be somewhat recent and be at least 10k (we keep the biggest one)
maybe_previous_migration_log_id = check_output("cd /var/log/yunohost/categories/operation && find -name '*migrate*.log -size +10k -mtime -100 -exec ls -s {} \\; | sort -n | tr './' ' ' | awk '{print $2}' | tail -n 1")
if maybe_previous_migration_log_id:
logger.info(f"NB: the previous migration log id seems to be {maybe_previous_migration_log_id}. You can share it with the support team with : sudo yunohost log share {maybe_previous_migration_log_id}")
except Exception:
# Yeah it's not that important ... it's to simplify support ...
pass
raise YunohostError("migration_0021_not_buster2")
# Have > 1 Go free space on /var/ ?