lib/sysroot: Add some g_prefix_error() for ostree_sysroot_cleanup()
authorColin Walters <walters@verbum.org>
Wed, 14 Jun 2017 15:31:52 +0000 (11:31 -0400)
committerAtomic Bot <atomic-devel@projectatomic.io>
Thu, 15 Jun 2017 00:08:29 +0000 (00:08 +0000)
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

src/libostree/ostree-sysroot-cleanup.c

index c0b8bf0715b4e5bef5582ed13853b8e1be56e165..79663b66e2ff6d66d81702b416dd090a78a10e6a 100644 (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;