From: Colin Walters <walters@verbum.org>
Date: Wed, 16 Aug 2023 20:16:24 +0000 (-0400)
Subject: deploy: Add some error prefixing
X-Git-Tag: archive/raspbian/2023.7-3+rpi1~1^2~9^2^2~20^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=25a458b94b89b1d97fae1fdf763776a47575ee29;p=ostree.git

deploy: Add some error prefixing

We saw a bare
`Txn Rebase on <osname> failed: Failed to find kernel in /usr/lib/modules, /usr/lib/ostree-boot or /boot`
which isn't bad, but it'd be better to be a bit more specific.
---

diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c
index 1f37909d..48a49e47 100644
--- a/src/libostree/ostree-sysroot-deploy.c
+++ b/src/libostree/ostree-sysroot-deploy.c
@@ -3130,6 +3130,8 @@ sysroot_initialize_deployment (OstreeSysroot *self, const char *osname, const ch
                                OstreeDeployment **out_new_deployment, GCancellable *cancellable,
                                GError **error)
 {
+  GLNX_AUTO_PREFIX_ERROR ("Initializing deployment", error);
+
   g_assert (osname != NULL || self->booted_deployment != NULL);
 
   if (osname == NULL)
@@ -3460,6 +3462,8 @@ ostree_sysroot_deploy_tree_with_options (OstreeSysroot *self, const char *osname
                                          OstreeDeployment **out_new_deployment,
                                          GCancellable *cancellable, GError **error)
 {
+  GLNX_AUTO_PREFIX_ERROR ("Deploying tree", error);
+
   if (!_ostree_sysroot_ensure_writable (self, error))
     return FALSE;
 
@@ -3664,6 +3668,8 @@ ostree_sysroot_stage_tree_with_options (OstreeSysroot *self, const char *osname,
                                         OstreeDeployment **out_new_deployment,
                                         GCancellable *cancellable, GError **error)
 {
+  GLNX_AUTO_PREFIX_ERROR ("Staging deployment", error);
+
   if (!_ostree_sysroot_ensure_writable (self, error))
     return FALSE;