Merge pull request #2870 from dustymabe/dusty-log-messages

lib/deploy: Disambiguate error messages for early prune space check
This commit is contained in:
Colin Walters 2023-06-01 08:24:48 -04:00 committed by GitHub
commit 5eacc96df3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2581,7 +2581,7 @@ auto_early_prune_old_deployments (OstreeSysroot *self, GPtrArray *new_deployment
gboolean bootfs_has_space = FALSE;
if (!dfd_fallocate_check (self->boot_fd, net_new_bootcsum_dirs_total_size, &bootfs_has_space,
error))
return glnx_prefix_error (error, "Checking if bootfs has space");
return glnx_prefix_error (error, "Checking if bootfs has sufficient space");
/* does the bootfs have enough free space for temporarily holding both the new
* and old bootdirs? */
@ -2607,7 +2607,7 @@ auto_early_prune_old_deployments (OstreeSysroot *self, GPtrArray *new_deployment
if (!dfd_fallocate_check (
self->boot_fd, net_new_bootcsum_dirs_total_size - bootcsum_dirs_to_remove_total_size,
&bootfs_has_space, error))
return glnx_prefix_error (error, "Checking if bootfs has space");
return glnx_prefix_error (error, "Checking if prune would give bootfs sufficient space");
if (!bootfs_has_space)
{