ahill/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-01-26 14:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

prune: Skip calculating potential freed space in the dry run

Browse Source
This commit is contained in:
Bartłomiej Piotrowski 2024-05-14 18:00:48 +02:00 committed by Bart Piotrowski
parent 97c922f430
commit 050f6e35fe
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/flatpak-builtins-build-update-repo.c
View File

@ -656,14 +656,18 @@ flatpak_builtin_build_update_repo (int argc, char **argv,
cancellable, error))
return FALSE;
formatted_freed_size = g_format_size_full (objsize_total, 0);
g_print (_("Total objects: %u\n"), n_objects_total);
if (n_objects_pruned == 0)
g_print (_("No unreachable objects\n"));
else
g_print (_("Deleted %u objects, %s freed\n"),
n_objects_pruned, formatted_freed_size);
if (!opt_prune_dry_run)
{
formatted_freed_size = g_format_size_full (objsize_total, 0);
g_print (_("Total objects: %u\n"), n_objects_total);
if (n_objects_pruned == 0)
g_print (_("No unreachable objects\n"));
else
g_print (_("Deleted %u objects, %s freed\n"),
n_objects_pruned, formatted_freed_size);
}
}
return TRUE;

15
common/flatpak-prune.c
View File

@ -800,14 +800,17 @@ flatpak_repo_prune (OstreeRepo *repo,
g_timer_stop (timer);
g_info ("Elapsed time: %.1f sec", g_timer_elapsed (timer, NULL));
g_info ("Pruning unreachable objects");
g_timer_start (timer);
if (!dry_run)
{
g_info ("Pruning unreachable objects");
g_timer_start (timer);
if (!prune_unreachable_loose_objects (repo, &data, cancellable, error))
return FALSE;
if (!prune_unreachable_loose_objects (repo, &data, cancellable, error))
return FALSE;
g_timer_stop (timer);
g_info ("Elapsed time: %.1f sec", g_timer_elapsed (timer, NULL));
g_timer_stop (timer);
g_info ("Elapsed time: %.1f sec", g_timer_elapsed (timer, NULL));
}
}
/* Prune static deltas outside lock to avoid conflict with its exclusive lock */