shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2025-01-11 09:18:20 +03:00
Code Issues Projects Releases Wiki Activity

lib/sysroot: Add some g_prefix_error() for ostree_sysroot_cleanup()

Browse Source 
We saw this fail in a CI run. We've been trying to add strategic error prefixing
as a general rule, and this specific instance may help debug.

Closes: #929
Approved by: pwithnall
This commit is contained in:
Colin Walters 2017-06-14 11:31:52 -04:00 committed by Atomic Bot
parent 584735b1c9
commit 0e6d23835b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libostree/ostree-sysroot-cleanup.c
View File

@ -505,10 +505,10 @@ _ostree_sysroot_cleanup_internal (OstreeSysroot *self,
g_return_val_if_fail (self->loaded, FALSE);
if (!cleanup_other_bootversions (self, cancellable, error))
return FALSE;
return glnx_prefix_error (error, "Cleaning bootversions");
if (!cleanup_old_deployments (self, cancellable, error))
return FALSE;
return glnx_prefix_error (error, "Cleaning deployments");
OstreeRepo *repo = ostree_sysroot_repo (self);
if (!generate_deployment_refs (self, repo,
@ -516,12 +516,12 @@ _ostree_sysroot_cleanup_internal (OstreeSysroot *self,
self->subbootversion,
self->deployments,
cancellable, error))
return FALSE;
return glnx_prefix_error (error, "Generating deployment refs");
if (do_prune_repo)
{
if (!prune_repo (repo, cancellable, error))
return FALSE;
return glnx_prefix_error (error, "Pruning repo");
}
return TRUE;