From 70d790abeab6e8b6a0b7fe20f8cdd80af7028538 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Mon, 24 Jul 2023 08:48:51 -0400 Subject: [PATCH 1/2] sysroot: Add a bit more error prefixing While an error message I saw was pretty clear, this would be even more explicit. --- src/libostree/ostree-sysroot.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/libostree/ostree-sysroot.c b/src/libostree/ostree-sysroot.c index 68dddf4e..8bcc2f73 100644 --- a/src/libostree/ostree-sysroot.c +++ b/src/libostree/ostree-sysroot.c @@ -964,6 +964,8 @@ ostree_sysroot_load (OstreeSysroot *self, GCancellable *cancellable, GError **er static gboolean ensure_repo (OstreeSysroot *self, GError **error) { + GLNX_AUTO_PREFIX_ERROR ("Opening sysroot repo", error); + if (self->repo != NULL) return TRUE; if (!ensure_sysroot_fd (self, error)) @@ -1002,6 +1004,8 @@ ensure_repo (OstreeSysroot *self, GError **error) gboolean ostree_sysroot_initialize (OstreeSysroot *self, GError **error) { + GLNX_AUTO_PREFIX_ERROR ("Initializing sysroot", error); + if (!ensure_sysroot_fd (self, error)) return FALSE; From cf525ee6198e20adbc014a86de6199d2f34aec29 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Mon, 24 Jul 2023 08:52:49 -0400 Subject: [PATCH 2/2] repo: Clarify when we fail to parse a remote This would have directly pointed at the failing config file. --- src/libostree/ostree-repo.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c index fc15cb78..46d2c12c 100644 --- a/src/libostree/ostree-repo.c +++ b/src/libostree/ostree-repo.c @@ -2838,8 +2838,9 @@ static gboolean append_one_remote_config (OstreeRepo *self, GFile *path, GCancellable *cancellable, GError **error) { g_autoptr (GKeyFile) remotedata = g_key_file_new (); - if (!g_key_file_load_from_file (remotedata, gs_file_get_path_cached (path), 0, error)) - return FALSE; + const char *pathname = gs_file_get_path_cached (path); + if (!g_key_file_load_from_file (remotedata, pathname, 0, error)) + return glnx_prefix_error (error, "Failed to parse %s", pathname); return add_remotes_from_keyfile (self, remotedata, path, error); } @@ -3245,6 +3246,7 @@ reload_core_config (OstreeRepo *self, GCancellable *cancellable, GError **error) static gboolean reload_remote_config (OstreeRepo *self, GCancellable *cancellable, GError **error) { + GLNX_AUTO_PREFIX_ERROR ("Reloading remotes", error); g_mutex_lock (&self->remotes_lock); g_hash_table_remove_all (self->remotes);