keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

upgrader: Add more error-prefixing

Browse Source 
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.
This commit is contained in:
Jonathan Lebon 2020-05-14 12:32:58 -04:00 committed by OpenShift Merge Robot
parent 0bfd20c900
commit 1f5863a33f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/daemon/rpmostree-sysroot-upgrader.c
View File

@ -432,7 +432,7 @@ rpmostree_sysroot_upgrader_pull_base (RpmOstreeSysrootUpgrader *self,
g_autoptr(GVariant) opts = g_variant_ref_sink (g_variant_builder_end (optbuilder)); 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, if (!ostree_repo_pull_with_options (self->repo, origin_remote, opts, progress,
cancellable, error)) cancellable, error))
return FALSE; return glnx_prefix_error (error, "While pulling %s", override_commit ?: origin_ref);
if (progress) if (progress)
ostree_async_progress_finish (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, if (!ostree_sysroot_upgrader_check_timestamps (self->repo, self->base_revision,
new_base_rev, error)) new_base_rev, error))
return FALSE; return glnx_prefix_error (error, "While checking against deployment timestamp");
} }
g_free (self->base_revision); g_free (self->base_revision);