Skip to content

Commit

Permalink
compose: Add more error prefixing
Browse files Browse the repository at this point in the history
This helped me narrow down an issue I was hitting.
  • Loading branch information
jlebon committed Feb 27, 2024
1 parent 2a53eee commit eeef1e9
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/app/rpmostree-compose-builtin-tree.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -871,6 +871,8 @@ static gboolean
impl_install_tree (RpmOstreeTreeComposeContext *self, gboolean *out_changed,
GCancellable *cancellable, GError **error)
{
GLNX_AUTO_PREFIX_ERROR ("Installing packages", error);

/* Set this early here, so we only have to set it one more time in the
* complete exit path too.
*/
Expand Down Expand Up @@ -1134,6 +1136,8 @@ pull_local_into_target_repo (OstreeRepo *src_repo, OstreeRepo *dest_repo, const
static gboolean
impl_commit_tree (RpmOstreeTreeComposeContext *self, GCancellable *cancellable, GError **error)
{
GLNX_AUTO_PREFIX_ERROR ("Postprocessing and committing", error);

auto gpgkey = (*self->treefile_rs)->get_gpg_key ();

/* pick up any initramfs regeneration args to shove into the metadata */
Expand Down
2 changes: 2 additions & 0 deletions src/libpriv/rpmostree-postprocess.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -591,6 +591,8 @@ cleanup_selinux_lockfiles (int rootfs_fd, GCancellable *cancellable, GError **er
gboolean
rpmostree_rootfs_postprocess_common (int rootfs_fd, GCancellable *cancellable, GError **error)
{
GLNX_AUTO_PREFIX_ERROR ("Doing common postprocessing", error);

if (!rename_if_exists (rootfs_fd, "etc", rootfs_fd, "usr/etc", error))
return FALSE;

Expand Down

0 comments on commit eeef1e9

Please sign in to comment.