From a51535b0cd9f64702c35a04d54f42b2998403b67 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Thu, 1 Jun 2023 00:00:28 -0400 Subject: [PATCH] lib/deploy: Disambiguate error messages for early prune space check Having the same error message in multiple places means it's not clear which case failed. Let's make them unique. --- src/libostree/ostree-sysroot-deploy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c index 425abe8b..c5ced04c 100644 --- a/src/libostree/ostree-sysroot-deploy.c +++ b/src/libostree/ostree-sysroot-deploy.c @@ -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) { -- 2.30.2