diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c index 4f0a9239..b64ef1e0 100644 --- a/src/libostree/ostree-repo-commit.c +++ b/src/libostree/ostree-repo-commit.c @@ -602,6 +602,7 @@ write_content_object (OstreeRepo *self, GCancellable *cancellable, GError **error) { + GLNX_AUTO_PREFIX_ERROR ("Writing content object", error); g_return_val_if_fail (expected_checksum || out_csum, FALSE); if (g_cancellable_set_error_if_cancelled (cancellable, error)) @@ -844,8 +845,7 @@ write_content_object (OstreeRepo *self, uid, gid, mode, xattrs, cancellable, error)) - return glnx_prefix_error (error, "Writing object %s.%s", actual_checksum, - ostree_object_type_to_string (OSTREE_OBJECT_TYPE_FILE)); + return FALSE; } /* Update statistics */ @@ -886,6 +886,8 @@ adopt_and_commit_regfile (OstreeRepo *self, GCancellable *cancellable, GError **error) { + GLNX_AUTO_PREFIX_ERROR ("Commit regfile (adopt)", error); + g_assert (G_IN_SET (self->mode, OSTREE_REPO_MODE_BARE, OSTREE_REPO_MODE_BARE_USER_ONLY)); g_autoptr(GBytes) header = _ostree_file_header_new (finfo, xattrs); @@ -981,6 +983,8 @@ write_metadata_object (OstreeRepo *self, GCancellable *cancellable, GError **error) { + GLNX_AUTO_PREFIX_ERROR ("Writing metadata object", error); + g_return_val_if_fail (expected_checksum || out_csum, FALSE); if (g_cancellable_set_error_if_cancelled (cancellable, error)) diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c index 69cea4f0..21d96cc6 100644 --- a/src/libostree/ostree-repo.c +++ b/src/libostree/ostree-repo.c @@ -1797,6 +1797,7 @@ repo_create_at_internal (int dfd, GCancellable *cancellable, GError **error) { + GLNX_AUTO_PREFIX_ERROR ("Creating repo", error); struct stat stbuf; /* We do objects/ last - if it exists we do nothing and exit successfully */ const char *state_dirs[] = { "tmp", "extensions", "state",