From 1f5863a33ffb8259520984b8b131403986962631 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Thu, 14 May 2020 12:32:58 -0400 Subject: [PATCH] upgrader: Add more error-prefixing Both libostree and the upgrader do timestamp checks, and the error message is exactly the same. So it's hard to tell which path exactly failed. Add some error-prefixing to make debugging easier. --- src/daemon/rpmostree-sysroot-upgrader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/daemon/rpmostree-sysroot-upgrader.c b/src/daemon/rpmostree-sysroot-upgrader.c index c26a33e4..4e595b1b 100644 --- a/src/daemon/rpmostree-sysroot-upgrader.c +++ b/src/daemon/rpmostree-sysroot-upgrader.c @@ -432,7 +432,7 @@ rpmostree_sysroot_upgrader_pull_base (RpmOstreeSysrootUpgrader *self, g_autoptr(GVariant) opts = g_variant_ref_sink (g_variant_builder_end (optbuilder)); if (!ostree_repo_pull_with_options (self->repo, origin_remote, opts, progress, cancellable, error)) - return FALSE; + return glnx_prefix_error (error, "While pulling %s", override_commit ?: origin_ref); if (progress) ostree_async_progress_finish (progress); @@ -503,7 +503,7 @@ rpmostree_sysroot_upgrader_pull_base (RpmOstreeSysrootUpgrader *self, { if (!ostree_sysroot_upgrader_check_timestamps (self->repo, self->base_revision, new_base_rev, error)) - return FALSE; + return glnx_prefix_error (error, "While checking against deployment timestamp"); } g_free (self->base_revision);