From: Colin Walters <walters@verbum.org>
Date: Wed, 14 Jun 2017 15:31:52 +0000 (-0400)
Subject: lib/sysroot: Add some g_prefix_error() for ostree_sysroot_cleanup()
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~4^2~36^2~10
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0e6d23835baedc472d3967105ba1f0d9f25068a8;p=ostree.git

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

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
---

diff --git a/src/libostree/ostree-sysroot-cleanup.c b/src/libostree/ostree-sysroot-cleanup.c
index c0b8bf07..79663b66 100644
--- a/src/libostree/ostree-sysroot-cleanup.c
+++ b/src/libostree/ostree-sysroot-cleanup.c
@@ -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;