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

Merge pull request #1496 from YunoHost/ci-format-dev

Browse source 
[CI] Format code with Black
This commit is contained in:
Alexandre Aubin 2022-08-28 17:57:44 +02:00 • committed by GitHub
commit c0ceb66ad4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/migrations/0021_migrate_to_bullseye.py
View file

@ -389,14 +389,17 @@ class MyMigration(Migration):
): ):
try: 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) # 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") 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: 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}") 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: except Exception:
# Yeah it's not that important ... it's to simplify support ... # Yeah it's not that important ... it's to simplify support ...
pass pass
raise YunohostError("migration_0021_not_buster2") raise YunohostError("migration_0021_not_buster2")
# Have > 1 Go free space on /var/ ? # Have > 1 Go free space on /var/ ?

4
src/tools.py
View file

@ -219,7 +219,9 @@ def tools_postinstall(
) )
# Check there's at least 10 GB on the rootfs... # Check there's at least 10 GB on the rootfs...
disk_partitions = sorted(psutil.disk_partitions(all=True), key=lambda k: k.mountpoint) disk_partitions = sorted(
psutil.disk_partitions(all=True), key=lambda k: k.mountpoint
)
main_disk_partitions = [d for d in disk_partitions if d.mountpoint in ["/", "/var"]] main_disk_partitions = [d for d in disk_partitions if d.mountpoint in ["/", "/var"]]
main_space = sum( main_space = sum(
psutil.disk_usage(d.mountpoint).total for d in main_disk_partitions psutil.disk_usage(d.mountpoint).total for d in main_disk_partitions